diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-01-09 23:52:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:42 -0500 |
| commit | 532347e2bbae9e849816dc7b12a3d0f2c42d4944 (patch) | |
| tree | 5705f688cd0cd35684126c66a684492f5344dc0d | |
| parent | e866cfa939de7f52c154a9495eb5767f89abf453 (diff) | |
[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>
| -rw-r--r-- | net/sunrpc/clnt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 5530ac8c6df9..a44da8b3d240 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
| @@ -268,7 +268,8 @@ rpc_shutdown_client(struct rpc_clnt *clnt) | |||
| 268 | clnt->cl_oneshot = 0; | 268 | clnt->cl_oneshot = 0; |
| 269 | clnt->cl_dead = 0; | 269 | clnt->cl_dead = 0; |
| 270 | rpc_killall_tasks(clnt); | 270 | rpc_killall_tasks(clnt); |
| 271 | sleep_on_timeout(&destroy_wait, 1*HZ); | 271 | wait_event_timeout(destroy_wait, |
| 272 | atomic_read(&clnt->cl_users) > 0, 1*HZ); | ||
| 272 | } | 273 | } |
| 273 | 274 | ||
| 274 | if (atomic_read(&clnt->cl_users) < 0) { | 275 | if (atomic_read(&clnt->cl_users) < 0) { |