dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Al Viro 2011-11-17 01:40:05 -05:00
parent 29db78aa0a
commit be7e0950de
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/disk-io.c
View 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:

2
fs/btrfs/super.c
View 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);
}