diff --git a/[refs] b/[refs]
index 12f94ed049e9..039e5b646868 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf51624999e56c88154b5f7d451a265db6aabff7
+refs/heads/master: 897c6ff9568bcb102ffc6b465ebe1def0cba829d
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index 5a4fe8be462a..6d4e8174b6db 100644
--- a/trunk/fs/super.c
+++ b/trunk/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/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 0a3ea52d711e..e26de68059af 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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,