Merge tag 'nfs-for-6.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index bd00cfa..075b31c 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -129,11 +129,7 @@ static void nfs_ssc_unregister_ops(void)
 }
 #endif /* CONFIG_NFS_V4_2 */
 
-static struct shrinker acl_shrinker = {
-       .count_objects  = nfs_access_cache_count,
-       .scan_objects   = nfs_access_cache_scan,
-       .seeks          = DEFAULT_SEEKS,
-};
+static struct shrinker *acl_shrinker;
 
 /*
  * Register the NFS filesystems
@@ -153,9 +149,18 @@ int __init register_nfs_fs(void)
        ret = nfs_register_sysctl();
        if (ret < 0)
                goto error_2;
-       ret = register_shrinker(&acl_shrinker, "nfs-acl");
-       if (ret < 0)
+
+       acl_shrinker = shrinker_alloc(0, "nfs-acl");
+       if (!acl_shrinker) {
+               ret = -ENOMEM;
                goto error_3;
+       }
+
+       acl_shrinker->count_objects = nfs_access_cache_count;
+       acl_shrinker->scan_objects = nfs_access_cache_scan;
+
+       shrinker_register(acl_shrinker);
+
 #ifdef CONFIG_NFS_V4_2
        nfs_ssc_register_ops();
 #endif
@@ -175,7 +180,7 @@ error_0:
  */
 void __exit unregister_nfs_fs(void)
 {
-       unregister_shrinker(&acl_shrinker);
+       shrinker_free(acl_shrinker);
        nfs_unregister_sysctl();
        unregister_nfs4_fs();
 #ifdef CONFIG_NFS_V4_2
@@ -1071,7 +1076,7 @@ static void nfs_fill_super(struct super_block *sb, struct nfs_fs_context *ctx)
                sb->s_export_op = &nfs_export_ops;
                break;
        case 4:
-               sb->s_flags |= SB_POSIXACL;
+               sb->s_iflags |= SB_I_NOUMASK;
                sb->s_time_gran = 1;
                sb->s_time_min = S64_MIN;
                sb->s_time_max = S64_MAX;