Merge tag 'md/3.20-fixes' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index e4499d5b51e8f33a05fec43843c8648de834dfd7..322b2de02988fa6479c2d2831a5e5d70dfdad7c9 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -311,7 +311,6 @@ const struct super_operations nfs_sops = {
        .destroy_inode  = nfs_destroy_inode,
        .write_inode    = nfs_write_inode,
        .drop_inode     = nfs_drop_inode,
-       .put_super      = nfs_put_super,
        .statfs         = nfs_statfs,
        .evict_inode    = nfs_evict_inode,
        .umount_begin   = nfs_umount_begin,
@@ -405,12 +404,15 @@ void __exit unregister_nfs_fs(void)
        unregister_filesystem(&nfs_fs_type);
 }
 
-void nfs_sb_active(struct super_block *sb)
+bool nfs_sb_active(struct super_block *sb)
 {
        struct nfs_server *server = NFS_SB(sb);
 
-       if (atomic_inc_return(&server->active) == 1)
-               atomic_inc(&sb->s_active);
+       if (!atomic_inc_not_zero(&sb->s_active))
+               return false;
+       if (atomic_inc_return(&server->active) != 1)
+               atomic_dec(&sb->s_active);
+       return true;
 }
 EXPORT_SYMBOL_GPL(nfs_sb_active);
 
@@ -2065,11 +2067,6 @@ static int nfs23_validate_mount_data(void *options,
                return NFS_TEXT_DATA;
        }
 
-#if !IS_ENABLED(CONFIG_NFS_V3)
-       if (args->version == 3)
-               goto out_v3_not_compiled;
-#endif /* !CONFIG_NFS_V3 */
-
        return 0;
 
 out_no_data:
@@ -2085,12 +2082,6 @@ out_no_sec:
        dfprintk(MOUNT, "NFS: nfs_mount_data version supports only AUTH_SYS\n");
        return -EINVAL;
 
-#if !IS_ENABLED(CONFIG_NFS_V3)
-out_v3_not_compiled:
-       dfprintk(MOUNT, "NFS: NFSv3 is not compiled into kernel\n");
-       return -EPROTONOSUPPORT;
-#endif /* !CONFIG_NFS_V3 */
-
 out_nomem:
        dfprintk(MOUNT, "NFS: not enough memory to handle mount options\n");
        return -ENOMEM;
@@ -2580,7 +2571,7 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server,
                error = nfs_bdi_register(server);
                if (error) {
                        mntroot = ERR_PTR(error);
-                       goto error_splat_bdi;
+                       goto error_splat_super;
                }
                server->super = s;
        }
@@ -2612,9 +2603,6 @@ error_splat_root:
        dput(mntroot);
        mntroot = ERR_PTR(error);
 error_splat_super:
-       if (server && !s->s_root)
-               bdi_unregister(&server->backing_dev_info);
-error_splat_bdi:
        deactivate_locked_super(s);
        goto out;
 }
@@ -2661,28 +2649,20 @@ out:
 }
 EXPORT_SYMBOL_GPL(nfs_fs_mount);
 
-/*
- * Ensure that we unregister the bdi before kill_anon_super
- * releases the device name
- */
-void nfs_put_super(struct super_block *s)
-{
-       struct nfs_server *server = NFS_SB(s);
-
-       bdi_unregister(&server->backing_dev_info);
-}
-EXPORT_SYMBOL_GPL(nfs_put_super);
-
 /*
  * Destroy an NFS2/3 superblock
  */
 void nfs_kill_super(struct super_block *s)
 {
        struct nfs_server *server = NFS_SB(s);
+       dev_t dev = s->s_dev;
+
+       generic_shutdown_super(s);
 
-       kill_anon_super(s);
        nfs_fscache_release_super_cookie(s);
+
        nfs_free_server(server);
+       free_anon_bdev(dev);
 }
 EXPORT_SYMBOL_GPL(nfs_kill_super);