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

btrfs-progs: subvol list: open code list_subvol_fill_paths in its caller

Browse Source 
The helper is quite simple and there's only one caller, so merge them.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-09-29 19:35:24 +02:00
parent fad9a54f88
commit 649ccbfa2e
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmds/subvolume-list.c
View File

@ -1114,24 +1114,6 @@ static void filter_and_sort_subvol(struct rb_root *all_subvols,
} }
} }
static int list_subvol_fill_paths(int fd, struct rb_root *root_lookup)
{
struct rb_node *n;
n = rb_first(root_lookup);
while (n) {
struct root_info *entry;
int ret;
entry = to_root_info(n);
ret = lookup_ino_path(fd, entry);
if (ret && ret != -ENOENT)
return ret;
n = rb_next(n);
}
return 0;
}
static void print_subvolume_column(struct root_info *subv, static void print_subvolume_column(struct root_info *subv,
enum btrfs_list_column_enum column) enum btrfs_list_column_enum column)
{ {
@ -1314,6 +1296,7 @@ next:
static int btrfs_list_subvols(int fd, struct rb_root *root_lookup) static int btrfs_list_subvols(int fd, struct rb_root *root_lookup)
{ {
int ret; int ret;
struct rb_node *n;
ret = list_subvol_search(fd, root_lookup); ret = list_subvol_search(fd, root_lookup);
if (ret) { if (ret) {
@ -1325,8 +1308,18 @@ static int btrfs_list_subvols(int fd, struct rb_root *root_lookup)
* now we have an rbtree full of root_info objects, but we need to fill * now we have an rbtree full of root_info objects, but we need to fill
* in their path names within the subvol that is referencing each one. * in their path names within the subvol that is referencing each one.
*/ */
ret = list_subvol_fill_paths(fd, root_lookup); n = rb_first(root_lookup);
return ret; while (n) {
struct root_info *entry;
int ret;
entry = to_root_info(n);
ret = lookup_ino_path(fd, entry);
if (ret && ret != -ENOENT)
return ret;
n = rb_next(n);
}
return 0;
} }
static int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set, static int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,