diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2012-12-11 15:24:59 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-02-01 16:55:03 +0100 |
| commit | 68120361745cc2cca7ad01170653b57649f26da6 (patch) | |
| tree | 83db09cd4db172d5011672074d1536f9b9ecc9ad /cmds-subvolume.c | |
| parent | e599d6c5daede0a06e637e6293af1c9b3523c24c (diff) | |
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>
Diffstat (limited to 'cmds-subvolume.c')
| -rw-r--r-- | cmds-subvolume.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 1f29ed31..fbda90b8 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -273,7 +273,7 @@ out: } 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>", "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", " distinguish absolute and relative path with respect", " to the given <path>", + "-o print only subvolumes bellow specified path", "-u print the uuid of subvolumes (and snapshots)", "-t print the result as a table", "-s list snapshots only in the filesystem", @@ -310,6 +311,7 @@ static int cmd_subvol_list(int argc, char **argv) char *subvol; int is_tab_result = 0; int is_list_all = 0; + int is_only_in_path = 1; struct option long_options[] = { {"sort", 1, NULL, 'S'}, {0, 0, 0, 0} @@ -321,7 +323,7 @@ static int cmd_subvol_list(int argc, char **argv) optind = 1; while(1) { c = getopt_long(argc, argv, - "apsurg:c:t", long_options, NULL); + "aopsurg:c:t", long_options, NULL); if (c < 0) break; @@ -332,6 +334,9 @@ static int cmd_subvol_list(int argc, char **argv) case 'a': is_list_all = 1; break; + case 'o': + is_only_in_path = 1; + break; case 't': is_tab_result = 1; break; @@ -408,7 +413,7 @@ static int cmd_subvol_list(int argc, char **argv) btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_FULL_PATH, top_id); - else + else if (is_only_in_path) btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_TOPID_EQUAL, top_id); |