forked from Mirrors/btrfs-progs
Btrfs-progs: add '-o' option into subvolume list command
This commit introduces new option '-o' to list only subvolumes under the specified path. This does not change subvolume list behaviour. It has been default in the past and it is even with this commit. Signed-off-by: Lukas Czerner <lczerner@redhat.com>master
parent
e599d6c5da
commit
6812036174
|
@ -273,7 +273,7 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char * const cmd_subvol_list_usage[] = {
|
static const char * const cmd_subvol_list_usage[] = {
|
||||||
"btrfs subvolume list [-apurts] [-g [+|-]value] [-c [+|-]value] "
|
"btrfs subvolume list [-aopurts] [-g [+|-]value] [-c [+|-]value] "
|
||||||
"[--sort=gen,ogen,rootid,path] <path>",
|
"[--sort=gen,ogen,rootid,path] <path>",
|
||||||
"List subvolumes (and snapshots)",
|
"List subvolumes (and snapshots)",
|
||||||
"",
|
"",
|
||||||
|
@ -281,6 +281,7 @@ static const char * const cmd_subvol_list_usage[] = {
|
||||||
"-a print all the subvolumes in the filesystem and",
|
"-a print all the subvolumes in the filesystem and",
|
||||||
" distinguish absolute and relative path with respect",
|
" distinguish absolute and relative path with respect",
|
||||||
" to the given <path>",
|
" to the given <path>",
|
||||||
|
"-o print only subvolumes bellow specified path",
|
||||||
"-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 list snapshots only in the filesystem",
|
"-s list snapshots only in the filesystem",
|
||||||
|
@ -310,6 +311,7 @@ static int cmd_subvol_list(int argc, char **argv)
|
||||||
char *subvol;
|
char *subvol;
|
||||||
int is_tab_result = 0;
|
int is_tab_result = 0;
|
||||||
int is_list_all = 0;
|
int is_list_all = 0;
|
||||||
|
int is_only_in_path = 1;
|
||||||
struct option long_options[] = {
|
struct option long_options[] = {
|
||||||
{"sort", 1, NULL, 'S'},
|
{"sort", 1, NULL, 'S'},
|
||||||
{0, 0, 0, 0}
|
{0, 0, 0, 0}
|
||||||
|
@ -321,7 +323,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,
|
||||||
"apsurg:c:t", long_options, NULL);
|
"aopsurg:c:t", long_options, NULL);
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -332,6 +334,9 @@ static int cmd_subvol_list(int argc, char **argv)
|
||||||
case 'a':
|
case 'a':
|
||||||
is_list_all = 1;
|
is_list_all = 1;
|
||||||
break;
|
break;
|
||||||
|
case 'o':
|
||||||
|
is_only_in_path = 1;
|
||||||
|
break;
|
||||||
case 't':
|
case 't':
|
||||||
is_tab_result = 1;
|
is_tab_result = 1;
|
||||||
break;
|
break;
|
||||||
|
@ -408,7 +413,7 @@ static int cmd_subvol_list(int argc, char **argv)
|
||||||
btrfs_list_setup_filter(&filter_set,
|
btrfs_list_setup_filter(&filter_set,
|
||||||
BTRFS_LIST_FILTER_FULL_PATH,
|
BTRFS_LIST_FILTER_FULL_PATH,
|
||||||
top_id);
|
top_id);
|
||||||
else
|
else if (is_only_in_path)
|
||||||
btrfs_list_setup_filter(&filter_set,
|
btrfs_list_setup_filter(&filter_set,
|
||||||
BTRFS_LIST_FILTER_TOPID_EQUAL,
|
BTRFS_LIST_FILTER_TOPID_EQUAL,
|
||||||
top_id);
|
top_id);
|
||||||
|
|
|
@ -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 [-aprts] [-g [+|-]value] [-c [+|-]value] [--rootid=rootid,gen,ogen,path] <path>\fP
|
\fBbtrfs\fP \fBsubvolume list\fP\fI [-aoprts] [-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
|
||||||
|
@ -114,7 +114,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 [-aprts][-g [+|-]value] [-c [+|-]value] [--sort=gen,ogen,rootid,path] <path>\fR
|
\fBsubvolume list\fR\fI [-aoprts][-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.
|
||||||
|
@ -133,6 +133,8 @@ and top level. The parent's ID may be used at mount time via the
|
||||||
\fB-a\fP print all the subvolumes in the filesystem and distinguish between
|
\fB-a\fP print all the subvolumes in the filesystem and distinguish between
|
||||||
absolute and relative path with respect to the given <path>.
|
absolute and relative path with respect to the given <path>.
|
||||||
|
|
||||||
|
\fB-o\fP print only subvolumes bellow specified <path>.
|
||||||
|
|
||||||
\fB-r\fP only readonly subvolumes in the filesystem wille be listed.
|
\fB-r\fP only readonly subvolumes in the filesystem wille be listed.
|
||||||
|
|
||||||
\fB-s\fP only snapshot subvolumes in the filesystem will be listed.
|
\fB-s\fP only snapshot subvolumes in the filesystem will be listed.
|
||||||
|
|
Loading…
Reference in New Issue