marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs-progs: update btrfs_get_subvol to be inline with resolve_root ret changes 

Signed-off-by: Anand Jain <anand.jain@oracle.com>
master
Anand Jain 2013-02-01 15:56:30 +08:00 committed by David Sterba
parent 64edc851da
commit 11825e7a29
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
btrfs-list.c
View File

@ -1517,19 +1517,24 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
int btrfs_get_subvol(int fd, struct root_info *the_ri)
{
int ret = -1;
int ret = 1, rr;
struct root_lookup rl;
struct rb_node *rbn;
struct root_info *ri;
u64 root_id = btrfs_list_get_path_rootid(fd);
if (btrfs_list_subvols(fd, &rl))
return 1;
return ret;
rbn = rb_first(&rl.root);
while(rbn) {
ri = rb_entry(rbn, struct root_info, rb_node);
resolve_root(&rl, ri, root_id);
rr = resolve_root(&rl, ri, root_id);
if (rr == -ENOENT) {
ret = -ENOENT;
rbn = rb_next(rbn);
continue;
}
if (!comp_entry_with_rootid(the_ri, ri, 0)) {
memcpy(the_ri, ri, offsetof(struct root_info, path));
if (ri->path)