From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 10 Jan 2006 04:52:53 +0000 (-0800)
Subject: [PATCH] nfs: sleep_on() removal
X-Git-Tag: v2.6.16-rc1~565
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=532347e2bbae9e849816dc7b12a3d0f2c42d4944;p=linux-2.6-omap-h63xx.git

[PATCH] nfs: sleep_on() removal

Convert sleep_on() to wait_event_timeout().  Probably safe with the BKL but
could be racy once BKL use in NFS-client is gone.

Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 5530ac8c6df..a44da8b3d24 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -268,7 +268,8 @@ rpc_shutdown_client(struct rpc_clnt *clnt)
 		clnt->cl_oneshot = 0;
 		clnt->cl_dead = 0;
 		rpc_killall_tasks(clnt);
-		sleep_on_timeout(&destroy_wait, 1*HZ);
+		wait_event_timeout(destroy_wait,
+			atomic_read(&clnt->cl_users) > 0, 1*HZ);
 	}
 
 	if (atomic_read(&clnt->cl_users) < 0) {