| Message ID | a666deeeb9a7f9194406562ee8ef632f1852b4bd.1636143924.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: extent tree v2 global root support prep work | expand |
On 06/11/2021 04:28, Josef Bacik wrote: > Running with ASAN we won't pass the self tests because we leak the whole > fs_info with btrfs filesystem show. Fix this by making sure we close > out the fs_info and clean up all of the memory and such. > Looks good. Reviewed-by: Anand Jain <anand.jain@oracle.com> > Signed-off-by: Josef Bacik <josef@toxicpanda.com> > --- > cmds/filesystem.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/cmds/filesystem.c b/cmds/filesystem.c > index 6a9e46d2..624d0288 100644 > --- a/cmds/filesystem.c > +++ b/cmds/filesystem.c > @@ -655,6 +655,7 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd, > { > LIST_HEAD(all_uuids); > struct btrfs_fs_devices *fs_devices; > + struct btrfs_root *root = NULL; > char *search = NULL; > int ret; > /* default, search both kernel and udev */ > @@ -753,12 +754,8 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd, > > devs_only: > if (type == BTRFS_ARG_REG) { > - /* > - * Given input (search) is regular file. > - * We don't close the fs_info because it will free the device, > - * this is not a long-running process so it's fine > - */ > - if (open_ctree(search, btrfs_sb_offset(0), 0)) > + root = open_ctree(search, btrfs_sb_offset(0), 0); > + if (root) > ret = 0; > else > ret = 1; > @@ -768,7 +765,7 @@ devs_only: > > if (ret) { > error("blkid device scan returned %d", ret); > - return 1; > + goto out; > } > > /* > @@ -779,13 +776,13 @@ devs_only: > ret = search_umounted_fs_uuids(&all_uuids, search, &found); > if (ret < 0) { > error("searching target device returned error %d", ret); > - return 1; > + goto out; > } > > ret = map_seed_devices(&all_uuids); > if (ret) { > error("mapping seed devices returned error %d", ret); > - return 1; > + goto out; > } > > list_for_each_entry(fs_devices, &all_uuids, list) > @@ -801,8 +798,10 @@ devs_only: > free_fs_devices(fs_devices); > } > out: > + if (root) > + close_ctree(root); > free_seen_fsid(seen_fsid_hash); > - return ret; > + return !!ret; > } > static DEFINE_SIMPLE_COMMAND(filesystem_show, "show"); > >
diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 6a9e46d2..624d0288 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -655,6 +655,7 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd, { LIST_HEAD(all_uuids); struct btrfs_fs_devices *fs_devices; + struct btrfs_root *root = NULL; char *search = NULL; int ret; /* default, search both kernel and udev */ @@ -753,12 +754,8 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd, devs_only: if (type == BTRFS_ARG_REG) { - /* - * Given input (search) is regular file. - * We don't close the fs_info because it will free the device, - * this is not a long-running process so it's fine - */ - if (open_ctree(search, btrfs_sb_offset(0), 0)) + root = open_ctree(search, btrfs_sb_offset(0), 0); + if (root) ret = 0; else ret = 1; @@ -768,7 +765,7 @@ devs_only: if (ret) { error("blkid device scan returned %d", ret); - return 1; + goto out; } /* @@ -779,13 +776,13 @@ devs_only: ret = search_umounted_fs_uuids(&all_uuids, search, &found); if (ret < 0) { error("searching target device returned error %d", ret); - return 1; + goto out; } ret = map_seed_devices(&all_uuids); if (ret) { error("mapping seed devices returned error %d", ret); - return 1; + goto out; } list_for_each_entry(fs_devices, &all_uuids, list) @@ -801,8 +798,10 @@ devs_only: free_fs_devices(fs_devices); } out: + if (root) + close_ctree(root); free_seen_fsid(seen_fsid_hash); - return ret; + return !!ret; } static DEFINE_SIMPLE_COMMAND(filesystem_show, "show");
Running with ASAN we won't pass the self tests because we leak the whole fs_info with btrfs filesystem show. Fix this by making sure we close out the fs_info and clean up all of the memory and such. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- cmds/filesystem.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)