RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-22 22:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: btrfs_list_get_path_rootid error handling

Browse Source 
btrfs_list_get_path_rootid() tries to return a negative
number on error, but it's a u64 function.  Callers which test
for a return < 0 will never see an error.

Change the function to fill in the rootid via a pointer,
and then return a simple int as error.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
This commit is contained in:
Eric Sandeen 2013-02-25 16:54:37 -06:00 committed by David Sterba
parent b26746e462
commit b808cb66aa
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
btrfs-list.c
View File

@ -1500,8 +1500,13 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
{
struct root_lookup root_lookup;
struct root_lookup root_sort;
int ret;
u64 top_id = (full_path ? 0 : btrfs_list_get_path_rootid(fd));
int ret = 0;
u64 top_id = 0;
if (full_path)
ret = btrfs_list_get_path_rootid(fd, &top_id);
if (ret)
return ret;
ret = btrfs_list_subvols(fd, &root_lookup);
if (ret)
@ -1524,13 +1529,18 @@ char *strdup_or_null(const char *s)
int btrfs_get_subvol(int fd, struct root_info *the_ri)
{
int ret = 1, rr;
int ret, rr;
struct root_lookup rl;
struct rb_node *rbn;
struct root_info *ri;
u64 root_id = btrfs_list_get_path_rootid(fd);
u64 root_id;
if (btrfs_list_subvols(fd, &rl))
ret = btrfs_list_get_path_rootid(fd, &root_id);
if (ret)
return ret;
ret = btrfs_list_subvols(fd, &rl);
if (ret)
return ret;
rbn = rb_first(&rl.root);
@ -1741,7 +1751,11 @@ char *btrfs_list_path_for_root(int fd, u64 root)
struct rb_node *n;
char *ret_path = NULL;
int ret;
u64 top_id = btrfs_list_get_path_rootid(fd);
u64 top_id;
ret = btrfs_list_get_path_rootid(fd, &top_id);
if (ret)
return ERR_PTR(ret);
ret = __list_subvol_search(fd, &root_lookup);
if (ret < 0)
@ -1868,7 +1882,7 @@ int btrfs_list_parse_filter_string(char *optarg,
return 0;
}
u64 btrfs_list_get_path_rootid(int fd)
int btrfs_list_get_path_rootid(int fd, u64 *treeid)
{
int ret;
struct btrfs_ioctl_ino_lookup_args args;
@ -1883,5 +1897,6 @@ u64 btrfs_list_get_path_rootid(int fd)
strerror(errno));
return ret;
}
return args.treeid;
*treeid = args.treeid;
return 0;
}

2
btrfs-list.h
View File

@ -156,5 +156,5 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
int btrfs_list_find_updated_files(int fd, u64 root_id, u64 oldest_gen);
int btrfs_list_get_default_subvolume(int fd, u64 *default_id);
char *btrfs_list_path_for_root(int fd, u64 root);
u64 btrfs_list_get_path_rootid(int fd);
int btrfs_list_get_path_rootid(int fd, u64 *treeid);
int btrfs_get_subvol(int fd, struct root_info *the_ri);

14
cmds-subvolume.c
View File

@ -433,7 +433,11 @@ static int cmd_subvol_list(int argc, char **argv)
goto out;
}
top_id = btrfs_list_get_path_rootid(fd);
ret = btrfs_list_get_path_rootid(fd, &top_id);
if (ret) {
fprintf(stderr, "ERROR: can't get rootid for '%s'\n", subvol);
goto out;
}
if (is_list_all)
btrfs_list_setup_filter(&filter_set,
@ -821,8 +825,8 @@ static int cmd_subvol_show(int argc, char **argv)
goto out;
}
sv_id = btrfs_list_get_path_rootid(fd);
if (sv_id < 0) {
ret = btrfs_list_get_path_rootid(fd, &sv_id);
if (ret) {
fprintf(stderr, "ERROR: can't get rootid for '%s'\n",
fullpath);
goto out;
@ -834,8 +838,8 @@ static int cmd_subvol_show(int argc, char **argv)
goto out;
}
mntid = btrfs_list_get_path_rootid(mntfd);
if (mntid < 0) {
ret = btrfs_list_get_path_rootid(mntfd, &mntid);
if (ret) {
fprintf(stderr, "ERROR: can't get rootid for '%s'\n", mnt);
goto out;
}