From a4b14cfbeb6a34ab8e257757468a63244723cdab Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 7 Dec 2010 01:51:26 +0000
Subject: [PATCH] --- yaml --- r: 223074 b: refs/heads/master c:
 f106e82caaa0d943e47cacc184f5b40d538e0044 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 997bbdb8e7dc..98b08d82184e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75eaa0e22c055e38982df267d0f84cc510ba38bf
+refs/heads/master: f106e82caaa0d943e47cacc184f5b40d538e0044
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 47bf67cbe6bf..61bd79abb805 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -685,9 +685,9 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		mutex_unlock(&root->d_inode->i_mutex);
 
 		if (IS_ERR(new_root)) {
+			dput(root);
 			deactivate_locked_super(s);
 			error = PTR_ERR(new_root);
-			dput(root);
 			goto error_free_subvol_name;
 		}
 		if (!new_root->d_inode) {