[84/99] NFSv4: Kill nfs4_renewd_prepare_shutdown()

From: Greg KH
Date: Fri Nov 06 2009 - 17:28:05 EST

2.6.31-stable review patch. If anyone has any objections, please let us know.

From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

fs/nfs/nfs4renewd.c | 6 ------
fs/nfs/super.c | 1 -
2 files changed, 7 deletions(-)

--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -127,12 +127,6 @@ nfs4_schedule_state_renewal(struct nfs_c

-nfs4_renewd_prepare_shutdown(struct nfs_server *server)
- cancel_delayed_work(&server->nfs_client->cl_renewd);
nfs4_kill_renewd(struct nfs_client *clp)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2670,7 +2670,6 @@ static void nfs4_kill_super(struct super
dprintk("--> %s\n", __func__);
- nfs4_renewd_prepare_shutdown(server);
dprintk("<-- %s\n", __func__);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/