Merge tag 'nfsd-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

[linux-2.6-microblaze.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 31909f5..3edbfa0 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4402,8 +4402,7 @@ static unsigned long
 nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc)
 {
        int count;
-       struct nfsd_net *nn = container_of(shrink,
-                       struct nfsd_net, nfsd_client_shrinker);
+       struct nfsd_net *nn = shrink->private_data;
 
        count = atomic_read(&nn->nfsd_courtesy_clients);
        if (!count)
@@ -8171,12 +8170,16 @@ static int nfs4_state_create_net(struct net *net)
        INIT_WORK(&nn->nfsd_shrinker_work, nfsd4_state_shrinker_worker);
        get_net(net);
 
-       nn->nfsd_client_shrinker.scan_objects = nfsd4_state_shrinker_scan;
-       nn->nfsd_client_shrinker.count_objects = nfsd4_state_shrinker_count;
-       nn->nfsd_client_shrinker.seeks = DEFAULT_SEEKS;
-
-       if (register_shrinker(&nn->nfsd_client_shrinker, "nfsd-client"))
+       nn->nfsd_client_shrinker = shrinker_alloc(0, "nfsd-client");
+       if (!nn->nfsd_client_shrinker)
                goto err_shrinker;
+
+       nn->nfsd_client_shrinker->scan_objects = nfsd4_state_shrinker_scan;
+       nn->nfsd_client_shrinker->count_objects = nfsd4_state_shrinker_count;
+       nn->nfsd_client_shrinker->private_data = nn;
+
+       shrinker_register(nn->nfsd_client_shrinker);
+
        return 0;
 
 err_shrinker:
@@ -8274,7 +8277,7 @@ nfs4_state_shutdown_net(struct net *net)
        struct list_head *pos, *next, reaplist;
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
-       unregister_shrinker(&nn->nfsd_client_shrinker);
+       shrinker_free(nn->nfsd_client_shrinker);
        cancel_work(&nn->nfsd_shrinker_work);
        cancel_delayed_work_sync(&nn->laundromat_work);
        locks_end_grace(&nn->nfsd4_manager);