summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-12-08 11:36:14 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:28:38 +0100
commit35a6027f1ab6594068cb8bca7705e4567753946b (patch)
tree43c4a501343b5d1531b2043408061f5f03d96ae6 /fs
parent[PATCH] remove the old bd_mutex lockdep annotation (diff)
downloadlinux-35a6027f1ab6594068cb8bca7705e4567753946b.tar.xz
linux-35a6027f1ab6594068cb8bca7705e4567753946b.zip
[PATCH] new bd_mutex lockdep annotation
Use the gendisk partition number to set a lock class. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Neil Brown <neilb@cse.unsw.edu.au> Cc: Ingo Molnar <mingo@elte.hu> Acked-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Jason Baron <jbaron@redhat.com> 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.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 36c38f48a4ed..528cf053ce96 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -355,10 +355,14 @@ static int bdev_set(struct inode *inode, void *data)
static LIST_HEAD(all_bdevs);
+static struct lock_class_key bdev_part_lock_key;
+
struct block_device *bdget(dev_t dev)
{
struct block_device *bdev;
struct inode *inode;
+ struct gendisk *disk;
+ int part = 0;
inode = iget5_locked(bd_mnt->mnt_sb, hash(dev),
bdev_test, bdev_set, &dev);
@@ -384,6 +388,11 @@ struct block_device *bdget(dev_t dev)
list_add(&bdev->bd_list, &all_bdevs);
spin_unlock(&bdev_lock);
unlock_new_inode(inode);
+ mutex_init(&bdev->bd_mutex);
+ disk = get_gendisk(dev, &part);
+ if (part)
+ lockdep_set_class(&bdev->bd_mutex, &bdev_part_lock_key);
+ put_disk(disk);
}
return bdev;
}