summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-17 01:46:50 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-08 19:34:41 -0500
commitd22ca7de770e2a683eac000ba4db5a95e2f4c969 (patch)
treed84fb7d68173d3ea759e8a4f8bf1cd41fd0ad10f /fs
parentbe7e0950def403e90b5295ff2192c39967bf2aec (diff)
downloadlinux-d22ca7de770e2a683eac000ba4db5a95e2f4c969.tar.gz
linux-d22ca7de770e2a683eac000ba4db5a95e2f4c969.tar.bz2
linux-d22ca7de770e2a683eac000ba4db5a95e2f4c969.zip
btrfs: make free_fs_info() call ->kill_sb() unconditional
... and don't bother with it after btrfs_fill_super() failure - ->kill_sb() (unlike ->put_super()) will be called even if we have not got non-NULL ->s_root. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 8901b6c85260..f628a6a79ca6 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -946,7 +946,6 @@ 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);
}
@@ -1215,12 +1214,9 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
static void btrfs_kill_super(struct super_block *sb)
{
- struct btrfs_fs_info *fs_info = NULL;
- if (sb->s_root)
- fs_info = btrfs_sb(sb)->fs_info;
+ struct btrfs_fs_info *fs_info = btrfs_sb(sb)->fs_info;
kill_anon_super(sb);
- if (fs_info)
- free_fs_info(fs_info);
+ free_fs_info(fs_info);
}
static struct file_system_type btrfs_fs_type = {