lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs: consolidate failure exits in btrfs_mount() a bit

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-11-17 01:56:28 -05:00
parent d22ca7de77
commit 59553edf11
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/btrfs/super.c
View File

@@ -630,6 +630,7 @@ static int btrfs_fill_super(struct super_block *sb,
save_mount_options(sb, data); save_mount_options(sb, data);
cleancache_init_fs(sb); cleancache_init_fs(sb);
sb->s_flags |= MS_ACTIVE;
return 0; return 0;
fail_close: fail_close:
@@ -929,14 +930,10 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
} }
if (s->s_root) { if (s->s_root) {
if ((flags ^ s->s_flags) & MS_RDONLY) {
deactivate_locked_super(s);
error = -EBUSY;
goto error_close_devices;
}
btrfs_close_devices(fs_devices); btrfs_close_devices(fs_devices);
free_fs_info(fs_info); free_fs_info(fs_info);
if ((flags ^ s->s_flags) & MS_RDONLY)
error = -EBUSY;
} else { } else {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
@@ -945,19 +942,11 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
btrfs_sb(s)->fs_info->bdev_holder = fs_type; btrfs_sb(s)->fs_info->bdev_holder = fs_type;
error = btrfs_fill_super(s, fs_devices, data, error = btrfs_fill_super(s, fs_devices, data,
flags & MS_SILENT ? 1 : 0); flags & MS_SILENT ? 1 : 0);
if (error) {
deactivate_locked_super(s);
return ERR_PTR(error);
} }
s->s_flags |= MS_ACTIVE; root = !error ? get_default_root(s, subvol_objectid) : ERR_PTR(error);
} if (IS_ERR(root))
root = get_default_root(s, subvol_objectid);
if (IS_ERR(root)) {
deactivate_locked_super(s); deactivate_locked_super(s);
return root;
}
return root; return root;