X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fnfs%2Fnfs4renewd.c;h=5e2e4af1a0e6c016237448b8e810165da63190d3;hb=d7c9f1ed972b4a468dd24a2457721704dfe9ca70;hp=f5f4430fb2a4c0ba3d488878a9007f26397cae43;hpb=b0138a6cb7923a997d278b47c176778534d1095b;p=powerpc.git

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index f5f4430fb2..5e2e4af1a0 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -43,7 +43,6 @@
  * child task framework of the RPC layer?
  */
 
-#include <linux/smp_lock.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/sunrpc/sched.h>
@@ -128,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);
 }
 
 /*