Commit cf516249 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate ->s_lock

Teach special (per-filesystem) locking code to the lock validator.

Minimal effect on non-lockdep kernels: one extra parameter to alloc_super().

Signed-off-by: default avatarIngo Molnar <>
Signed-off-by: default avatarArjan van de Ven <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 91ebe2a9
......@@ -53,7 +53,7 @@ DEFINE_SPINLOCK(sb_lock);
* Allocates and initializes a new &struct super_block. alloc_super()
* returns a pointer new superblock or %NULL if allocation had failed.
static struct super_block *alloc_super(void)
static struct super_block *alloc_super(struct file_system_type *type)
struct super_block *s = kzalloc(sizeof(struct super_block), GFP_USER);
static struct super_operations default_op;
......@@ -72,6 +72,12 @@ static struct super_block *alloc_super(void)
* The locking rules for s_lock are up to the
* filesystem. For example ext3fs has different
* lock ordering than usbfs:
lockdep_set_class(&s->s_lock, &type->s_lock_key);
s->s_count = S_BIAS;
atomic_set(&s->s_active, 1);
......@@ -295,7 +301,7 @@ retry:
if (!s) {
s = alloc_super();
s = alloc_super(type);
if (!s)
return ERR_PTR(-ENOMEM);
goto retry;
......@@ -1295,6 +1295,7 @@ struct file_system_type {
struct module *owner;
struct file_system_type * next;
struct list_head fs_supers;
struct lock_class_key s_lock_key;
extern int get_sb_bdev(struct file_system_type *fs_type,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment