Currently "sub list -o" lists only child subvolumes of the specified path. So, update help message and variable name more appropriately.
Signed-off-by: Misono Tomohiro <misono.tomoh...@jp.fujitsu.com> --- Documentation/btrfs-subvolume.asciidoc | 2 +- cmds-subvolume.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/btrfs-subvolume.asciidoc b/Documentation/btrfs-subvolume.asciidoc index 20fae1e1..0381c92c 100644 --- a/Documentation/btrfs-subvolume.asciidoc +++ b/Documentation/btrfs-subvolume.asciidoc @@ -116,7 +116,7 @@ or at mount time via the subvolid= option. + Path filtering;; -o:::: -print only subvolumes below specified <path>. +print only subvolumes which the subvolume of <path> contains. -a:::: print all the subvolumes in the filesystem, including subvolumes which cannot be accessed from current mount point. diff --git a/cmds-subvolume.c b/cmds-subvolume.c index dab266aa..552c6dea 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -1550,7 +1550,7 @@ static const char * const cmd_subvol_list_usage[] = { "It is possible to specify non-subvolume directory as <path>.", "", "Path filtering:", - "-o print only subvolumes below specified path", + "-o print only subvolumes which the subvolume of <path> contains", "-a print all the subvolumes in the filesystem.", " path to be shown is relative to the top-level", " subvolume (require root privileges)", @@ -1605,7 +1605,7 @@ static int cmd_subvol_list(int argc, char **argv) int follow_mount = 0; int sort = 0; int no_sort = 0; - int is_only_in_path = 0; + int is_only_child = 0; int absolute_path = 0; DIR *dirstream = NULL; enum btrfs_list_layout layout = BTRFS_LIST_LAYOUT_DEFAULT; @@ -1651,7 +1651,7 @@ static int cmd_subvol_list(int argc, char **argv) btrfs_list_setup_print_column_v2(BTRFS_LIST_GENERATION); break; case 'o': - is_only_in_path = 1; + is_only_child = 1; break; case 't': layout = BTRFS_LIST_LAYOUT_TABLE; @@ -1732,7 +1732,7 @@ static int cmd_subvol_list(int argc, char **argv) goto out; } - if (follow_mount && (is_list_all || is_only_in_path)) { + if (follow_mount && (is_list_all || is_only_child)) { ret = -1; error("cannot use -f with -a or -o option"); goto out; @@ -1760,7 +1760,7 @@ static int cmd_subvol_list(int argc, char **argv) if (ret) goto out; - if (is_only_in_path) + if (is_only_child) btrfs_list_setup_filter_v2(&filter_set, BTRFS_LIST_FILTER_TOPID_EQUAL, top_id); -- 2.14.4 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html