aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJason Baron <jbaron@redhat.com>2006-09-29 05:01:01 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:19 -0400
commit87d7c8aca8670a772f74766c19e0345a606b67a9 (patch)
tree5373f4a6095d8772f33f1c9faa12f1a583f8f14e /fs
parent303912e2a32aa73785b4c4dee15466d944a38a46 (diff)
[PATCH] block_dev.c mutex_lock_nested() fix
In the case below we are locking the whole disk not a partition. This change simply brings the code in line with the piece above where when we are the 'first' opener, and we are a partition. Signed-off-by: Jason Baron <jbaron@redhat.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/block_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 8cc144ffc382..4346468139e8 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1031,7 +1031,7 @@ do_open(struct block_device *bdev, struct file *file, unsigned int subclass)
1031 rescan_partitions(bdev->bd_disk, bdev); 1031 rescan_partitions(bdev->bd_disk, bdev);
1032 } else { 1032 } else {
1033 mutex_lock_nested(&bdev->bd_contains->bd_mutex, 1033 mutex_lock_nested(&bdev->bd_contains->bd_mutex,
1034 BD_MUTEX_PARTITION); 1034 BD_MUTEX_WHOLE);
1035 bdev->bd_contains->bd_part_count++; 1035 bdev->bd_contains->bd_part_count++;
1036 mutex_unlock(&bdev->bd_contains->bd_mutex); 1036 mutex_unlock(&bdev->bd_contains->bd_mutex);
1037 } 1037 }