From 75e0b876bcca521d5292ac03dffc3237e6bc3932 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 8 Dec 2006 02:36:14 -0800
Subject: [PATCH] --- yaml --- r: 43501 b: refs/heads/master c:
 35a6027f1ab6594068cb8bca7705e4567753946b h: refs/heads/master i:   43499:
 90b1cf3624ffe9257640eff09e56b1859a78500e v: v3

---
 [refs]               | 2 +-
 trunk/fs/block_dev.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dc86f9fb7284..f689bde5315f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e7b651df113c8a463853e4169951c52c39f9d19
+refs/heads/master: 35a6027f1ab6594068cb8bca7705e4567753946b
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 36c38f48a4ed..528cf053ce96 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/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;
 }