Commit e75aa858 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds

block_dev: always serialize exclusive open attempts

bd_prepare_to_claim() incorrectly allowed multiple attempts for
exclusive open to progress in parallel if the attempting holders are
identical.  This triggered BUG_ON() as reported in the following bug.

  https://bugzilla.kernel.org/show_bug.cgi?id=16393

__bd_abort_claiming() is used to finish claiming blocks and doesn't
work if multiple openers are inside a claiming block.  Allowing
multiple parallel open attempts to continue doesn't gain anything as
those are serialized down in the call chain anyway.  Fix it by always
allowing only single open attempt in a claiming block.

This problem can easily be reproduced by adding a delay after
bd_prepare_to_claim() and attempting to mount two partitions of a
disk.

stable: only applicable to v2.6.35
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9b68e5e
...@@ -681,8 +681,8 @@ static int bd_prepare_to_claim(struct block_device *bdev, ...@@ -681,8 +681,8 @@ static int bd_prepare_to_claim(struct block_device *bdev,
if (!bd_may_claim(bdev, whole, holder)) if (!bd_may_claim(bdev, whole, holder))
return -EBUSY; return -EBUSY;
/* if someone else is claiming, wait for it to finish */ /* if claiming is already in progress, wait for it to finish */
if (whole->bd_claiming && whole->bd_claiming != holder) { if (whole->bd_claiming) {
wait_queue_head_t *wq = bit_waitqueue(&whole->bd_claiming, 0); wait_queue_head_t *wq = bit_waitqueue(&whole->bd_claiming, 0);
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment