NFSv4: Kill nfs4_renewd_prepare_shutdown()

commit 3050141bae57984dd660e6861632ccf9b8bca77e upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 3305acbbe2ae3b7f4258baed8f5f807fbf7a1805..6ede673351c4efd56d83146eaced77b47f819eab 100644 (file)
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -124,12 +124,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 e9b20173fef33835e9d87be1a9b67e718b8dfe0a..3da0fa582188f332f1b965237bc71d477caa9dcf 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2398,7 +2398,6 @@ static void nfs4_kill_super(struct super_block *sb)
        nfs_return_all_delegations(sb);
        kill_anon_super(sb);
 
-       nfs4_renewd_prepare_shutdown(server);
        nfs_free_server(server);
 }