From f0117929b60899d97a0d7a63bfb219098cd7939f Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 8 Dec 2006 02:36:14 -0800
Subject: [PATCH] --- yaml --- r: 43502 b: refs/heads/master c:
 fd27c7a1bfa9801544ca961cdb4ca0b4998580b8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f689bde5315f..5005f83781a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35a6027f1ab6594068cb8bca7705e4567753946b
+refs/heads/master: fd27c7a1bfa9801544ca961cdb4ca0b4998580b8
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 528cf053ce96..36c38f48a4ed 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -355,14 +355,10 @@ 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);
@@ -388,11 +384,6 @@ 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;
 }