[PATCH] nfs: sleep_on() removal
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Jan 2006 04:52:53 +0000 (20:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:01:42 +0000 (08:01 -0800)
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>
net/sunrpc/clnt.c

index 5530ac8c6df959ef36a9f5592ebec9004968dd57..a44da8b3d24076383c97574f4bb27cb957f22eb8 100644 (file)
@@ -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) {