X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fnfs%2Fnfs4renewd.c;h=5e2e4af1a0e6c016237448b8e810165da63190d3;hb=23386fe572028ca0f9249fb3c71ed31b54cf1665;hp=0505ca1240344d6096760f83a0d02c37f09c8e6a;hpb=eedab661a51966c454e38c17266a531aa58b4a98;p=linux-2.6-omap-h63xx.git

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 0505ca12403..5e2e4af1a0e 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -127,16 +127,13 @@ nfs4_schedule_state_renewal(struct nfs_client *clp)
 void
 nfs4_renewd_prepare_shutdown(struct nfs_server *server)
 {
-	flush_scheduled_work();
+	cancel_delayed_work(&server->nfs_client->cl_renewd);
 }
 
 void
 nfs4_kill_renewd(struct nfs_client *clp)
 {
-	down_read(&clp->cl_sem);
-	cancel_delayed_work(&clp->cl_renewd);
-	up_read(&clp->cl_sem);
-	flush_scheduled_work();
+	cancel_delayed_work_sync(&clp->cl_renewd);
 }
 
 /*