staging: comedi: vmk80xx: remove common and unused boardinfo

[pandora-kernel.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 0902cfa..12f1237 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -186,14 +186,7 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                spin_lock_init(&s->s_inode_lru_lock);
                INIT_LIST_HEAD(&s->s_mounts);
                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
-                * lock ordering than usbfs:
-                */
-               lockdep_set_class(&s->s_lock, &type->s_lock_key);
                /*
                 * sget() can have s_umount recursion.
                 *
@@ -307,12 +300,6 @@ void deactivate_locked_super(struct super_block *s)
 
                /* caches are now gone, we can safely kill the shrinker now */
                unregister_shrinker(&s->s_shrink);
-
-               /*
-                * We need to call rcu_barrier so all the delayed rcu free
-                * inodes are flushed before we release the fs module.
-                */
-               rcu_barrier();
                put_filesystem(fs);
                put_super(s);
        } else {
@@ -400,22 +387,6 @@ bool grab_super_passive(struct super_block *sb)
        return false;
 }
 
-/*
- * Superblock locking.  We really ought to get rid of these two.
- */
-void lock_super(struct super_block * sb)
-{
-       mutex_lock(&sb->s_lock);
-}
-
-void unlock_super(struct super_block * sb)
-{
-       mutex_unlock(&sb->s_lock);
-}
-
-EXPORT_SYMBOL(lock_super);
-EXPORT_SYMBOL(unlock_super);
-
 /**
  *     generic_shutdown_super  -       common helper for ->kill_sb()
  *     @sb: superblock to kill
@@ -871,7 +842,7 @@ int get_anon_bdev(dev_t *p)
        else if (error)
                return -EAGAIN;
 
-       if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
+       if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
                spin_lock(&unnamed_dev_lock);
                ida_remove(&unnamed_dev_ida, dev);
                if (unnamed_dev_start > dev)