Merge tag 'mm-stable-2023-11-01-14-33' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / fs / gfs2 / glock.c

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 3772a5d9e85c055b4a6cfedae92c835ba97d8675..d5fa75eac0bfee8ea4c677c798313eb79e3175ea 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -2041,11 +2041,7 @@ static unsigned long gfs2_glock_shrink_count(struct shrinker *shrink,
        return vfs_pressure_ratio(atomic_read(&lru_count));
 }
 
-static struct shrinker glock_shrinker = {
-       .seeks = DEFAULT_SEEKS,
-       .count_objects = gfs2_glock_shrink_count,
-       .scan_objects = gfs2_glock_shrink_scan,
-};
+static struct shrinker *glock_shrinker;
 
 /**
  * glock_hash_walk - Call a function for glock in a hash bucket
@@ -2465,13 +2461,18 @@ int __init gfs2_glock_init(void)
                return -ENOMEM;
        }
 
-       ret = register_shrinker(&glock_shrinker, "gfs2-glock");
-       if (ret) {
+       glock_shrinker = shrinker_alloc(0, "gfs2-glock");
+       if (!glock_shrinker) {
                destroy_workqueue(glock_workqueue);
                rhashtable_destroy(&gl_hash_table);
-               return ret;
+               return -ENOMEM;
        }
 
+       glock_shrinker->count_objects = gfs2_glock_shrink_count;
+       glock_shrinker->scan_objects = gfs2_glock_shrink_scan;
+
+       shrinker_register(glock_shrinker);
+
        for (i = 0; i < GLOCK_WAIT_TABLE_SIZE; i++)
                init_waitqueue_head(glock_wait_table + i);
 
@@ -2480,7 +2481,7 @@ int __init gfs2_glock_init(void)
 
 void gfs2_glock_exit(void)
 {
-       unregister_shrinker(&glock_shrinker);
+       shrinker_free(glock_shrinker);
        rhashtable_destroy(&gl_hash_table);
        destroy_workqueue(glock_workqueue);
 }