The patch titled lockdep: annotate sb ->s_umount has been removed from the -mm tree. Its filename is lockdep-annotate-sb-s_umount.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: lockdep: annotate sb ->s_umount From: Arjan van de Ven <arjan@xxxxxxxxxxxxx> The s_umount rwsem needs to be classified as per-superblock since it's perfectly legit to keep multiple of those recursively in the VFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/super.c | 1 + include/linux/fs.h | 1 + 2 files changed, 2 insertions(+) diff -puN fs/super.c~lockdep-annotate-sb-s_umount fs/super.c --- a/fs/super.c~lockdep-annotate-sb-s_umount +++ a/fs/super.c @@ -72,6 +72,7 @@ static struct super_block *alloc_super(s INIT_LIST_HEAD(&s->s_inodes); init_rwsem(&s->s_umount); mutex_init(&s->s_lock); + lockdep_set_class(&s->s_umount, &type->s_umount_key); /* * The locking rules for s_lock are up to the * filesystem. For example ext3fs has different diff -puN include/linux/fs.h~lockdep-annotate-sb-s_umount include/linux/fs.h --- a/include/linux/fs.h~lockdep-annotate-sb-s_umount +++ a/include/linux/fs.h @@ -1296,6 +1296,7 @@ struct file_system_type { struct file_system_type * next; struct list_head fs_supers; struct lock_class_key s_lock_key; + struct lock_class_key s_umount_key; }; extern int get_sb_bdev(struct file_system_type *fs_type, _ Patches currently in -mm which might be from arjan@xxxxxxxxxxxxx are origin.patch debug-shared-irqs.patch vdso-print-fatal-signals.patch vdso-improve-print_fatal_signals-support-by-adding-memory-maps.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