Commit 6796bf54 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

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

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

Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 37be4124
...@@ -920,7 +920,7 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part) ...@@ -920,7 +920,7 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
} }
owner = disk->fops->owner; owner = disk->fops->owner;
mutex_lock(&bdev->bd_mutex); mutex_lock_nested(&bdev->bd_mutex, for_part);
if (!bdev->bd_openers) { if (!bdev->bd_openers) {
bdev->bd_disk = disk; bdev->bd_disk = disk;
bdev->bd_contains = bdev; bdev->bd_contains = bdev;
...@@ -1062,7 +1062,7 @@ static int __blkdev_put(struct block_device *bdev, int for_part) ...@@ -1062,7 +1062,7 @@ static int __blkdev_put(struct block_device *bdev, int for_part)
struct gendisk *disk = bdev->bd_disk; struct gendisk *disk = bdev->bd_disk;
struct block_device *victim = NULL; struct block_device *victim = NULL;
mutex_lock(&bdev->bd_mutex); mutex_lock_nested(&bdev->bd_mutex, for_part);
lock_kernel(); lock_kernel();
if (for_part) if (for_part)
bdev->bd_part_count--; bdev->bd_part_count--;
......
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