NFSv4: Kill nfs4_renewd_prepare_shutdown()

The NFSv4 renew daemon is shared between all active super blocks that refer
to a particular NFS server, so it is wrong to be shutting it down in
nfs4_kill_super every time a super block is destroyed.

This patch therefore kills nfs4_renewd_prepare_shutdown altogether, and
leaves it up to nfs4_shutdown_client() to also shut down the renew daemon
by means of the existing call to nfs4_kill_renewd().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index e27c6cef18f291abb642141e762055bcaf85f4f6..0156c01c212c26ee9cf358a2ec21ed31853f33af 100644 (file)
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -126,12 +126,6 @@ nfs4_schedule_state_renewal(struct nfs_client *clp)
        spin_unlock(&clp->cl_lock);
 }
 
-void
-nfs4_renewd_prepare_shutdown(struct nfs_server *server)
-{
-       cancel_delayed_work(&server->nfs_client->cl_renewd);
-}
-
 void
 nfs4_kill_renewd(struct nfs_client *clp)
 {

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index fb3b280cacfee812bfb2c0d4674d44f7390b2fce..6dabf6feec94a6a0727a77f17dbcec58c2cbcdf8 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2689,7 +2689,6 @@ static void nfs4_kill_super(struct super_block *sb)
        dprintk("--> %s\n", __func__);
        nfs_super_return_all_delegations(sb);
        kill_anon_super(sb);
-       nfs4_renewd_prepare_shutdown(server);
        nfs_fscache_release_super_cookie(sb);
        nfs_free_server(server);
        dprintk("<-- %s\n", __func__);