From 5013b3b581d2232c50a7c81771ad0eecce6811cc Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Fri, 21 Dec 2012 10:38:50 +0000
Subject: [PATCH] --- yaml --- r: 349159 b: refs/heads/master c:
 97547676570b3bd908560741315bf4b7d635bcf5 h: refs/heads/master i:   349157:
 baf724b96d76e4d951e586dbc5d17d93daa3ab18   349155:
 6027dc35d0db4149d6e1ca2551738350bb74eaf5   349151:
 91fbd31248e63754d4f616d395da44ab913e2668 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47c8518936f4..1f8882fc9c19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba60f3f5d564167118cad151a7d41dfe8d2a5f7
+refs/heads/master: 97547676570b3bd908560741315bf4b7d635bcf5
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 0de21213d05d..982c0b9ceea5 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1339,6 +1339,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
 	if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
 			1)) {
 		pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n");
+		mnt_drop_write_file(file);
 		return -EINPROGRESS;
 	}