David Sterba
2012-Jul-17 09:14 UTC
[PATCH] btrfs-progs: mkfs: rename nodiscard option to K
The original patch named the option -T, mkfs.xfs uses -K let''s keep it
same.
Signed-off-by: David Sterba <dsterba@suse.cz>
---
Based on 8935d8436147f (current master) not yet tagged as 0.20, I hope
it''s
still time to fix it before it''s released. Sorry for not sending the
patch
earlier.
man/mkfs.btrfs.8.in | 2 +-
mkfs.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/man/mkfs.btrfs.8.in b/man/mkfs.btrfs.8.in
index fc2e1d2..ca57044 100644
--- a/man/mkfs.btrfs.8.in
+++ b/man/mkfs.btrfs.8.in
@@ -63,7 +63,7 @@ Specify the sectorsize, the minimum block allocation.
\fB\-r\fR, \fB\-\-rootdir \fIrootdir\fR
Specify a directory to copy into the newly created fs.
.TP
-\fB\-T\fR, \fB\-\-nodiscard \fR
+\fB\-K\fR, \fB\-\-nodiscard \fR
Do not perform whole device TRIM operation by default.
.TP
\fB\-V\fR, \fB\-\-version\fR
diff --git a/mkfs.c b/mkfs.c
index dff5eb8..394a622 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -348,7 +348,7 @@ static void print_usage(void)
fprintf(stderr, "\t -n --nodesize size of btree nodes\n");
fprintf(stderr, "\t -s --sectorsize min block allocation\n");
fprintf(stderr, "\t -r --rootdir the source directory\n");
- fprintf(stderr, "\t -T --nodiscard do not perform whole device
TRIM\n");
+ fprintf(stderr, "\t -K --nodiscard do not perform whole device
TRIM\n");
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
exit(1);
}
@@ -410,7 +410,7 @@ static struct option long_options[] = {
{ "data", 1, NULL, ''d'' },
{ "version", 0, NULL, ''V'' },
{ "rootdir", 1, NULL, ''r'' },
- { "nodiscard", 0, NULL, ''T'' },
+ { "nodiscard", 0, NULL, ''K'' },
{ 0, 0, 0, 0}
};
@@ -1237,7 +1237,7 @@ int main(int ac, char **av)
while(1) {
int c;
- c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMT", long_options,
+ c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMK", long_options,
&option_index);
if (c < 0)
break;
@@ -1283,7 +1283,7 @@ int main(int ac, char **av)
source_dir = optarg;
source_dir_set = 1;
break;
- case ''T'':
+ case ''K'':
nodiscard=1;
break;
default:
--
1.7.6.233.gd79bc
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Tomasz Torcz
2012-Jul-17 09:24 UTC
Re: [PATCH] btrfs-progs: mkfs: rename nodiscard option to K
On Tue, Jul 17, 2012 at 11:14:17AM +0200, David Sterba wrote:> The original patch named the option -T, mkfs.xfs uses -K let''s keep it > same.mkfs.ext2 used to have "-K" also, so one more +1 for this patch. -- Tomasz Torcz Only gods can safely risk perfection, xmpp: zdzichubg@chrome.pl it''s a dangerous thing for a man. -- Alia -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Sterba
2012-Jul-17 10:30 UTC
[PATCH v2] btrfs-progs: mkfs: rename nodiscard option to K
The original patch named the option -T, mkfs.xfs uses -K let''s keep it
same.
Signed-off-by: David Sterba <dsterba@suse.cz>
---
v1->v2:
original patch at
http://comments.gmane.org/gmane.comp.file-systems.btrfs/16287
listed the shot option, dunno where it got lost, adding it now.
man/mkfs.btrfs.8.in | 3 ++-
mkfs.c | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/man/mkfs.btrfs.8.in b/man/mkfs.btrfs.8.in
index fc2e1d2..8c157c1 100644
--- a/man/mkfs.btrfs.8.in
+++ b/man/mkfs.btrfs.8.in
@@ -13,6 +13,7 @@ mkfs.btrfs \- create an btrfs filesystem
[ \fB\-n\fP\fI nodesize\fP ]
[ \fB\-s\fP\fI sectorsize\fP ]
[ \fB\-r\fP\fI rootdir\fP ]
+[ \fB\-K\fP ]
[ \fB\-h\fP ]
[ \fB\-V\fP ]
\fI device\fP [ \fIdevice ...\fP ]
@@ -63,7 +64,7 @@ Specify the sectorsize, the minimum block allocation.
\fB\-r\fR, \fB\-\-rootdir \fIrootdir\fR
Specify a directory to copy into the newly created fs.
.TP
-\fB\-T\fR, \fB\-\-nodiscard \fR
+\fB\-K\fR, \fB\-\-nodiscard \fR
Do not perform whole device TRIM operation by default.
.TP
\fB\-V\fR, \fB\-\-version\fR
diff --git a/mkfs.c b/mkfs.c
index dff5eb8..394a622 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -348,7 +348,7 @@ static void print_usage(void)
fprintf(stderr, "\t -n --nodesize size of btree nodes\n");
fprintf(stderr, "\t -s --sectorsize min block allocation\n");
fprintf(stderr, "\t -r --rootdir the source directory\n");
- fprintf(stderr, "\t -T --nodiscard do not perform whole device
TRIM\n");
+ fprintf(stderr, "\t -K --nodiscard do not perform whole device
TRIM\n");
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
exit(1);
}
@@ -410,7 +410,7 @@ static struct option long_options[] = {
{ "data", 1, NULL, ''d'' },
{ "version", 0, NULL, ''V'' },
{ "rootdir", 1, NULL, ''r'' },
- { "nodiscard", 0, NULL, ''T'' },
+ { "nodiscard", 0, NULL, ''K'' },
{ 0, 0, 0, 0}
};
@@ -1237,7 +1237,7 @@ int main(int ac, char **av)
while(1) {
int c;
- c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMT", long_options,
+ c = getopt_long(ac, av, "A:b:l:n:s:m:d:L:r:VMK", long_options,
&option_index);
if (c < 0)
break;
@@ -1283,7 +1283,7 @@ int main(int ac, char **av)
source_dir = optarg;
source_dir_set = 1;
break;
- case ''T'':
+ case ''K'':
nodiscard=1;
break;
default:
--
1.7.9
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html