The patch titled
lockdep: remove lock_key approach to managing nested bd_mutex locks
has been added to the -mm tree. Its filename is
remove-lock_key-approach-to-managing-nested-bd_mutex-locks.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lockdep: remove lock_key approach to managing nested bd_mutex locks
From: NeilBrown <neilb@xxxxxxx>
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@xxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/block_dev.c | 9 ---------
1 files changed, 9 deletions(-)
diff -puN fs/block_dev.c~remove-lock_key-approach-to-managing-nested-bd_mutex-locks fs/block_dev.c
--- a/fs/block_dev.c~remove-lock_key-approach-to-managing-nested-bd_mutex-locks
+++ a/fs/block_dev.c
@@ -355,14 +355,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);
@@ -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;
}
_
Patches currently in -mm which might be from neilb@xxxxxxx are
origin.patch
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
md-use-build_bug_on.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
remove-lock_key-approach-to-managing-nested-bd_mutex-locks.patch
simplify-some-aspects-of-bd_mutex-nesting.patch
use-mutex_lock_nested-for-bd_mutex-to-avoid-lockdep-warning.patch
avoid-lockdep-warning-in-md.patch
knfsd-add-nfs-export-support-to-tmpfs.patch
md-conditionalize-some-code.patch
md-dm-reduce-stack-usage-with-stacked-block-devices.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
