NFSv4: Kill nfs4_renewd_prepare_shutdown() (3050141b) · Commits · 戴 / test

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>

fs/nfs/nfs4renewd.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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)
		{

fs/nfs/super.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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__);

Admin message