[PATCH 001 of 4] Remove lock_key approach to managing nested bd_mutex locks.

NeilBrown
2006-10-11T06:09:27Z

The extra call to get_gendisk is not good. It causes a ->probe and possible
module load before it is really appropriate to do this.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
./fs/block_dev.c | 9 ---------
1 file changed, 9 deletions(-)

diff .prev/fs/block_dev.c ./fs/block_dev.c
--- .prev/fs/block_dev.c 2006-10-11 15:37:05.000000000 +1000
+++ ./fs/block_dev.c 2006-10-11 15:37:10.000000000 +1000
@@ -357,14 +357,10 @@ static int bdev_set(struct inode *inode,

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);
@@ -390,11 +386,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;
}