RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-04 23:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs-Progs: update '-s' option without a argument.

Browse Source 
Since '--sort' options was given ,and we can list snapshots in generation
order by --sort=+/-gen to replace '-s [0|1]' totally.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujistsu.com>
This commit is contained in:
Wang Shilong 2012-09-28 01:33:01 +08:00 committed by root
parent 8e8e019e91
commit e86f7198d9
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmds-subvolume.c
View File

@ -260,7 +260,7 @@ static int cmd_subvol_delete(int argc, char **argv)
} }
static const char * const cmd_subvol_list_usage[] = { static const char * const cmd_subvol_list_usage[] = {
"btrfs subvolume list [-apurt] [-s 0|1] [-g [+|-]value] [-c [+|-]value] " "btrfs subvolume list [-apurts] [-g [+|-]value] [-c [+|-]value] "
"[--sort=gen,ogen,rootid,path] <path>", "[--sort=gen,ogen,rootid,path] <path>",
"List subvolumes (and snapshots)", "List subvolumes (and snapshots)",
"", "",
@ -268,8 +268,7 @@ static const char * const cmd_subvol_list_usage[] = {
"-a print all the subvolumes in the filesystem.", "-a print all the subvolumes in the filesystem.",
"-u print the uuid of subvolumes (and snapshots)", "-u print the uuid of subvolumes (and snapshots)",
"-t print the result as a table", "-t print the result as a table",
"-s value list snapshots with generation in ascending/descending order", "-s list snapshots only in the filesystem",
" (1: ascending, 0: descending)",
"-r list readonly subvolumes (including snapshots)", "-r list readonly subvolumes (including snapshots)",
"-g [+|-]value", "-g [+|-]value",
" filter the subvolumes by generation", " filter the subvolumes by generation",
@ -292,7 +291,6 @@ static int cmd_subvol_list(int argc, char **argv)
int fd; int fd;
u64 top_id; u64 top_id;
int ret; int ret;
int order;
int c; int c;
char *subvol; char *subvol;
int is_tab_result = 0; int is_tab_result = 0;
@ -308,7 +306,7 @@ static int cmd_subvol_list(int argc, char **argv)
optind = 1; optind = 1;
while(1) { while(1) {
c = getopt_long(argc, argv, c = getopt_long(argc, argv,
"aps:urg:c:t", long_options, NULL); "apsurg:c:t", long_options, NULL);
if (c < 0) if (c < 0)
break; break;
@ -323,13 +321,9 @@ static int cmd_subvol_list(int argc, char **argv)
is_tab_result = 1; is_tab_result = 1;
break; break;
case 's': case 's':
order = atoi(optarg);
btrfs_list_setup_filter(&filter_set, btrfs_list_setup_filter(&filter_set,
BTRFS_LIST_FILTER_SNAPSHOT_ONLY, BTRFS_LIST_FILTER_SNAPSHOT_ONLY,
0); 0);
btrfs_list_setup_comparer(&comparer_set,
BTRFS_LIST_COMP_OGEN,
!order);
btrfs_list_setup_print_column(BTRFS_LIST_OGENERATION); btrfs_list_setup_print_column(BTRFS_LIST_OGENERATION);
btrfs_list_setup_print_column(BTRFS_LIST_OTIME); btrfs_list_setup_print_column(BTRFS_LIST_OTIME);

4
man/btrfs.8.in
View File

@ -11,7 +11,7 @@ btrfs \- control a btrfs filesystem
.PP .PP
\fBbtrfs\fP \fBsubvolume create\fP\fI [<dest>/]<name>\fP \fBbtrfs\fP \fBsubvolume create\fP\fI [<dest>/]<name>\fP
.PP .PP
\fBbtrfs\fP \fBsubvolume list\fP\fI [-aprt] [-s 0|1] [-g [+|-]value] [-c [+|-]value] [--rootid=rootid,gen,ogen,path] <path>\fP \fBbtrfs\fP \fBsubvolume list\fP\fI [-aprts] [-g [+|-]value] [-c [+|-]value] [--rootid=rootid,gen,ogen,path] <path>\fP
.PP .PP
\fBbtrfs\fP \fBsubvolume set-default\fP\fI <id> <path>\fP \fBbtrfs\fP \fBsubvolume set-default\fP\fI <id> <path>\fP
.PP .PP
@ -108,7 +108,7 @@ Create a subvolume in \fI<dest>\fR (or in the current directory if
\fI<dest>\fR is omitted). \fI<dest>\fR is omitted).
.TP .TP
\fBsubvolume list\fR\fI [-aprt][-s 0|1] [-g [+|-]value] [-c [+|-]value] [--sort=gen,ogen,rootid,path] <path>\fR \fBsubvolume list\fR\fI [-aprts][-g [+|-]value] [-c [+|-]value] [--sort=gen,ogen,rootid,path] <path>\fR
.RS .RS
List the subvolumes present in the filesystem \fI<path>\fR. For every List the subvolumes present in the filesystem \fI<path>\fR. For every
subvolume the following information is shown by default. subvolume the following information is shown by default.