The patch titled
lockdep: annotate sb ->s_umount
has been added to the -mm tree. Its filename is
lockdep-annotate-sb-s_umount.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: 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
@@ -73,6 +73,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
@@ -1352,6 +1352,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
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2-revert-maxmem-change.patch
lockdep-console_init-after-local_irq_enable.patch
lockdep-add-print_ip_sym.patch
lockdep-s390-config_frame_pointer-support.patch
lockdep-stacktrace-subsystem-s390-support.patch
lockdep-irqtrace-subsystem-s390-support.patch
lockdep-s390-turn-validator-off-in-machine-check-handler.patch
lockdep-annotate-sunrpc-code.patch
lockdep-annotate-sb-s_umount.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
