Merge tag 'nfs-for-5.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-block.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index bd22c933860050c4887066e675d9d4e5265eec35..94885c6f8f5410e388566828a80a64104effbb87 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = {
 };
 EXPORT_SYMBOL_GPL(nfs_sops);
 
+#ifdef CONFIG_NFS_V4_2
 static const struct nfs_ssc_client_ops nfs_ssc_clnt_ops_tbl = {
        .sco_sb_deactive = nfs_sb_deactive,
 };
+#endif
 
 #if IS_ENABLED(CONFIG_NFS_V4)
 static int __init register_nfs4_fs(void)
@@ -111,15 +113,21 @@ static void unregister_nfs4_fs(void)
 }
 #endif
 
+#ifdef CONFIG_NFS_V4_2
 static void nfs_ssc_register_ops(void)
 {
+#ifdef CONFIG_NFSD_V4
        nfs_ssc_register(&nfs_ssc_clnt_ops_tbl);
+#endif
 }
 
 static void nfs_ssc_unregister_ops(void)
 {
+#ifdef CONFIG_NFSD_V4
        nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl);
+#endif
 }
+#endif /* CONFIG_NFS_V4_2 */
 
 static struct shrinker acl_shrinker = {
        .count_objects  = nfs_access_cache_count,
@@ -148,7 +156,9 @@ int __init register_nfs_fs(void)
        ret = register_shrinker(&acl_shrinker);
        if (ret < 0)
                goto error_3;
+#ifdef CONFIG_NFS_V4_2
        nfs_ssc_register_ops();
+#endif
        return 0;
 error_3:
        nfs_unregister_sysctl();
@@ -168,7 +178,9 @@ void __exit unregister_nfs_fs(void)
        unregister_shrinker(&acl_shrinker);
        nfs_unregister_sysctl();
        unregister_nfs4_fs();
+#ifdef CONFIG_NFS_V4_2
        nfs_ssc_unregister_ops();
+#endif
        unregister_filesystem(&nfs_fs_type);
 }