adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] lockdep: use mutex_lock_nested for bd_mutex to avoid lockdep warning

Browse source 
Now that the nesting in blkdev_{get,put} is simpler, adding mutex_lock_nested
is trivial.

Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown 2006-12-08 02:36:16 -08:00 committed by Linus Torvalds
parent 37be41241f
commit 6796bf54a6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/block_dev.c
View file

@ -920,7 +920,7 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
}
owner = disk->fops->owner;
mutex_lock(&bdev->bd_mutex);
mutex_lock_nested(&bdev->bd_mutex, for_part);
if (!bdev->bd_openers) {
bdev->bd_disk = disk;
bdev->bd_contains = bdev;
@ -1062,7 +1062,7 @@ static int __blkdev_put(struct block_device *bdev, int for_part)
struct gendisk *disk = bdev->bd_disk;
struct block_device *victim = NULL;
mutex_lock(&bdev->bd_mutex);
mutex_lock_nested(&bdev->bd_mutex, for_part);
lock_kernel();
if (for_part)
bdev->bd_part_count--;