[PATCH] lockdep: annotate sb ->s_umount

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@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/super.c b/fs/super.c
index 5a4fe8be462ad998d0f32cdf270f710d210d6326..6d4e8174b6db4fd7548b94403aafdd49043966f9 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -72,6 +72,7 @@ static struct super_block *alloc_super(struct file_system_type *type)
                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 --git a/include/linux/fs.h b/include/linux/fs.h
index 0a3ea52d711eb83d831e94300808e40712848aaa..e26de68059afc1f1a1b25488c12b0b24cf67342c 100644 (file)
--- a/include/linux/fs.h
+++ b/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,