Commit e75aa85892b2ee78c79edac720868cbef16e62eb
Committed by
Linus Torvalds
1 parent
d9b68e5e88
Exists in
master
and in
7 other branches
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: Tejun Heo <tj@kernel.org> Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
fs/block_dev.c
... | ... | @@ -681,8 +681,8 @@ |
681 | 681 | if (!bd_may_claim(bdev, whole, holder)) |
682 | 682 | return -EBUSY; |
683 | 683 | |
684 | - /* if someone else is claiming, wait for it to finish */ | |
685 | - if (whole->bd_claiming && whole->bd_claiming != holder) { | |
684 | + /* if claiming is already in progress, wait for it to finish */ | |
685 | + if (whole->bd_claiming) { | |
686 | 686 | wait_queue_head_t *wq = bit_waitqueue(&whole->bd_claiming, 0); |
687 | 687 | DEFINE_WAIT(wait); |
688 | 688 |