Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[sfrench/cifs-2.6.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index de7b4d0c7e30840e011a816217ebf58bf065346a..451afbd543b522157d05f84c1f490b46884e7826 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -682,8 +682,8 @@ retry:
        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);