From 5b55627af322af6714ac2b31d743f744c4256bf0 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Wed, 4 Aug 2010 17:59:39 +0200
Subject: [PATCH] --- yaml --- r: 202554 b: refs/heads/master c:
 e75aa85892b2ee78c79edac720868cbef16e62eb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 18140202e121..4dd550aed53c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9b68e5e88248bb24fd4e455588bea1d56108fd6
+refs/heads/master: e75aa85892b2ee78c79edac720868cbef16e62eb
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 99d6af811747..b3171fb0dc9a 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -681,8 +681,8 @@ static int bd_prepare_to_claim(struct block_device *bdev,
 	if (!bd_may_claim(bdev, whole, holder))
 		return -EBUSY;
 
-	/* if someone else is claiming, wait for it to finish */
-	if (whole->bd_claiming && whole->bd_claiming != holder) {
+	/* if claiming is already in progress, wait for it to finish */
+	if (whole->bd_claiming) {
 		wait_queue_head_t *wq = bit_waitqueue(&whole->bd_claiming, 0);
 		DEFINE_WAIT(wait);