If you exec:
# btrfs sub show <dir> <== non-subvolume dir
The cmd print error messages as expected, but returns 0.
By convetion, it should return non-zero and we should explicitly
set it before it goto out.
With other pieces adopted:
1) removed a unnecessary return value set -EINVAL
2) fixed another code branch which may return 0 upon error.
3) with 2) applied, the ret = 0 follows can be removed
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
}
if (!ret) {
fprintf(stderr, "ERROR: '%s' is not a subvolume\n", fullpath);
}
if (!ret) {
fprintf(stderr, "ERROR: '%s' is not a subvolume\n", fullpath);
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
fullpath);
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
fullpath);
memset(&get_ri, 0, sizeof(get_ri));
get_ri.root_id = sv_id;
memset(&get_ri, 0, sizeof(get_ri));
get_ri.root_id = sv_id;
- if (btrfs_get_subvol(mntfd, &get_ri)) {
+ ret = btrfs_get_subvol(mntfd, &get_ri);
+ if (ret) {
fprintf(stderr, "ERROR: can't find '%s'\n",
svpath);
goto out;
}
fprintf(stderr, "ERROR: can't find '%s'\n",
svpath);
goto out;
}
/* print the info */
printf("%s\n", fullpath);
printf("\tName: \t\t\t%s\n", get_ri.name);
/* print the info */
printf("%s\n", fullpath);
printf("\tName: \t\t\t%s\n", get_ri.name);