btrfs: merge free_fs_info() calls on fill_super failures
Al Viro [Thu, 17 Nov 2011 06:40:05 +0000 (01:40 -0500)]
... all the way up into btrfs_mount().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/btrfs/disk-io.c
fs/btrfs/super.c

index 7824752..b6d11eb 100644 (file)
@@ -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:
index a381f9f..8901b6c 100644 (file)
@@ -634,7 +634,6 @@ static int btrfs_fill_super(struct super_block *sb,
 
 fail_close:
        close_ctree(tree_root);
-       free_fs_info(fs_info);
        return err;
 }
 
@@ -947,6 +946,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
                error = btrfs_fill_super(s, fs_devices, data,
                                         flags & MS_SILENT ? 1 : 0);
                if (error) {
+                       free_fs_info(fs_info);
                        deactivate_locked_super(s);
                        return ERR_PTR(error);
                }