From 300b06615bfaf85a3cf5804fbc1109265d32e652 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 17 Nov 2011 01:40:05 -0500
Subject: [PATCH] --- yaml --- r: 286027 b: refs/heads/master c:
 be7e0950def403e90b5295ff2192c39967bf2aec h: refs/heads/master i:   286025:
 26c122329e26b41b18cb6fae14b45922aab7316e   286023:
 b8ab93365e917006841ab47695e6d091bfdf8b29 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 2 --
 trunk/fs/btrfs/super.c   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d62663477c76..c95cb85bd0d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29db78aa0ac82319b764b87a1c5030d74523e296
+refs/heads/master: be7e0950def403e90b5295ff2192c39967bf2aec
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 78247522c693..b6d11eb4e430 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -2427,7 +2427,6 @@ int open_ctree(struct super_block *sb,
 		up_read(&fs_info->cleanup_work_sem);
 		if (err) {
 			close_ctree(tree_root);
-			free_fs_info(fs_info);
 			return err;
 		}
 	}
@@ -2478,7 +2477,6 @@ int open_ctree(struct super_block *sb,
 	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:
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index a381f9f9b0c2..8901b6c85260 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -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);
 		}