Commit 8e22cc88d68ca1a46d7d582938f979eb640ed30f

Authored by Marco Stornelli
Committed by Al Viro
1 parent b6963327e0

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>

Showing 2 changed files with 0 additions and 24 deletions Side-by-side Diff

... ... @@ -186,15 +186,8 @@
186 186 spin_lock_init(&s->s_inode_lru_lock);
187 187 INIT_LIST_HEAD(&s->s_mounts);
188 188 init_rwsem(&s->s_umount);
189   - mutex_init(&s->s_lock);
190 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 191 * sget() can have s_umount recursion.
199 192 *
200 193 * When it cannot find a suitable sb, it allocates a new
... ... @@ -393,22 +386,6 @@
393 386 put_super(sb);
394 387 return false;
395 388 }
396   -
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 389  
413 390 /**
414 391 * generic_shutdown_super - common helper for ->kill_sb()
... ... @@ -1507,7 +1507,6 @@
1507 1507 unsigned long s_magic;
1508 1508 struct dentry *s_root;
1509 1509 struct rw_semaphore s_umount;
1510   - struct mutex s_lock;
1511 1510 int s_count;
1512 1511 atomic_t s_active;
1513 1512 #ifdef CONFIG_SECURITY