Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 532347e2 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[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: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e866cfa9

net/sunrpc/clnt.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {