summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-17 01:40:05 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-08 19:34:40 -0500
commitbe7e0950def403e90b5295ff2192c39967bf2aec (patch)
treeee468d0b63e30ac8270e1daabc823b51e4759f25 /fs/btrfs/disk-io.c
parent29db78aa0ac82319b764b87a1c5030d74523e296 (diff)
downloadop-kernel-dev-be7e0950def403e90b5295ff2192c39967bf2aec.zip
op-kernel-dev-be7e0950def403e90b5295ff2192c39967bf2aec.tar.gz
btrfs: merge free_fs_info() calls on fill_super failures
... all the way up into btrfs_mount(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7824752..b6d11eb 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2427,7 +2427,6 @@ retry_root_backup:
up_read(&fs_info->cleanup_work_sem);
if (err) {
close_ctree(tree_root);
- free_fs_info(fs_info);
return err;
}
}
@@ -2478,7 +2477,6 @@ fail_srcu:
cleanup_srcu_struct(&fs_info->subvol_srcu);
fail:
btrfs_close_devices(fs_info->fs_devices);
- free_fs_info(fs_info);
return err;
recovery_tree_root:
OpenPOWER on IntegriCloud