diff options
author | Marco Stornelli <marco.stornelli@gmail.com> | 2012-10-06 06:43:09 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-09 23:33:39 -0400 |
commit | 8e22cc88d68ca1a46d7d582938f979eb640ed30f (patch) | |
tree | a5b5ed3af60067093dde81bd651046d24b0dfd45 /fs/super.c | |
parent | b6963327e0521e682c2fffd018574251d3c22b41 (diff) |
vfs: drop lock/unlock super
Removed s_lock from super_block and removed lock/unlock super.
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/fs/super.c b/fs/super.c index a3bc935069d9..12f123712161 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -186,15 +186,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) | |||
186 | spin_lock_init(&s->s_inode_lru_lock); | 186 | spin_lock_init(&s->s_inode_lru_lock); |
187 | INIT_LIST_HEAD(&s->s_mounts); | 187 | INIT_LIST_HEAD(&s->s_mounts); |
188 | init_rwsem(&s->s_umount); | 188 | init_rwsem(&s->s_umount); |
189 | mutex_init(&s->s_lock); | ||
190 | lockdep_set_class(&s->s_umount, &type->s_umount_key); | 189 | lockdep_set_class(&s->s_umount, &type->s_umount_key); |
191 | /* | 190 | /* |
192 | * The locking rules for s_lock are up to the | ||
193 | * filesystem. For example ext3fs has different | ||
194 | * lock ordering than usbfs: | ||
195 | */ | ||
196 | lockdep_set_class(&s->s_lock, &type->s_lock_key); | ||
197 | /* | ||
198 | * sget() can have s_umount recursion. | 191 | * sget() can have s_umount recursion. |
199 | * | 192 | * |
200 | * When it cannot find a suitable sb, it allocates a new | 193 | * When it cannot find a suitable sb, it allocates a new |
@@ -394,22 +387,6 @@ bool grab_super_passive(struct super_block *sb) | |||
394 | return false; | 387 | return false; |
395 | } | 388 | } |
396 | 389 | ||
397 | /* | ||
398 | * Superblock locking. We really ought to get rid of these two. | ||
399 | */ | ||
400 | void lock_super(struct super_block * sb) | ||
401 | { | ||
402 | mutex_lock(&sb->s_lock); | ||
403 | } | ||
404 | |||
405 | void unlock_super(struct super_block * sb) | ||
406 | { | ||
407 | mutex_unlock(&sb->s_lock); | ||
408 | } | ||
409 | |||
410 | EXPORT_SYMBOL(lock_super); | ||
411 | EXPORT_SYMBOL(unlock_super); | ||
412 | |||
413 | /** | 390 | /** |
414 | * generic_shutdown_super - common helper for ->kill_sb() | 391 | * generic_shutdown_super - common helper for ->kill_sb() |
415 | * @sb: superblock to kill | 392 | * @sb: superblock to kill |