marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
David Sterba 2012-07-17 12:30:16 +02:00
parent 89fe5b5f66
commit 366b9ca593
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/mkfs.btrfs.8.in
View File

@ -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

8
mkfs.c
View File

@ -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: