aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/super.c10
-rw-r--r--include/linux/fs.h1
2 files changed, 9 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c
index 9b780c42d845..5a4fe8be462a 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -53,7 +53,7 @@ DEFINE_SPINLOCK(sb_lock);
53 * Allocates and initializes a new &struct super_block. alloc_super() 53 * Allocates and initializes a new &struct super_block. alloc_super()
54 * returns a pointer new superblock or %NULL if allocation had failed. 54 * returns a pointer new superblock or %NULL if allocation had failed.
55 */ 55 */
56static struct super_block *alloc_super(void) 56static struct super_block *alloc_super(struct file_system_type *type)
57{ 57{
58 struct super_block *s = kzalloc(sizeof(struct super_block), GFP_USER); 58 struct super_block *s = kzalloc(sizeof(struct super_block), GFP_USER);
59 static struct super_operations default_op; 59 static struct super_operations default_op;
@@ -72,6 +72,12 @@ static struct super_block *alloc_super(void)
72 INIT_LIST_HEAD(&s->s_inodes); 72 INIT_LIST_HEAD(&s->s_inodes);
73 init_rwsem(&s->s_umount); 73 init_rwsem(&s->s_umount);
74 mutex_init(&s->s_lock); 74 mutex_init(&s->s_lock);
75 /*
76 * The locking rules for s_lock are up to the
77 * filesystem. For example ext3fs has different
78 * lock ordering than usbfs:
79 */
80 lockdep_set_class(&s->s_lock, &type->s_lock_key);
75 down_write(&s->s_umount); 81 down_write(&s->s_umount);
76 s->s_count = S_BIAS; 82 s->s_count = S_BIAS;
77 atomic_set(&s->s_active, 1); 83 atomic_set(&s->s_active, 1);
@@ -295,7 +301,7 @@ retry:
295 } 301 }
296 if (!s) { 302 if (!s) {
297 spin_unlock(&sb_lock); 303 spin_unlock(&sb_lock);
298 s = alloc_super(); 304 s = alloc_super(type);
299 if (!s) 305 if (!s)
300 return ERR_PTR(-ENOMEM); 306 return ERR_PTR(-ENOMEM);
301 goto retry; 307 goto retry;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 05ded9e76b23..0a3ea52d711e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1295,6 +1295,7 @@ struct file_system_type {
1295 struct module *owner; 1295 struct module *owner;
1296 struct file_system_type * next; 1296 struct file_system_type * next;
1297 struct list_head fs_supers; 1297 struct list_head fs_supers;
1298 struct lock_class_key s_lock_key;
1298}; 1299};
1299 1300
1300extern int get_sb_bdev(struct file_system_type *fs_type, 1301extern int get_sb_bdev(struct file_system_type *fs_type,