From: Ingo Molnar <mingo@elte.hu>

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

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

 net/sunrpc/clnt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN net/sunrpc/clnt.c~ingo-nfs-stuff net/sunrpc/clnt.c
--- 25/net/sunrpc/clnt.c~ingo-nfs-stuff	Fri Jan  6 15:46:31 2006
+++ 25-akpm/net/sunrpc/clnt.c	Fri Jan  6 15:46:31 2006
@@ -268,7 +268,8 @@ rpc_shutdown_client(struct rpc_clnt *cln
 		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) {
_