net/clnt: remove sleep_on*() usage
Subsystems (4)
PATCH 1/1 net/clnt: remove sleep_on*() usage
Hi,
Please consider applying.
Description: Directly use wait-queues instead of the deprecated sleep_on_timeout(). Since the sleep in this function is unconditional, wait_event_timeout() does not appear to be appropriate. Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
net/sunrpc/clnt.c +5 -1
@@ -28,6 +28,7 @@#include <linux/slab.h> #include <linux/in.h> #include <linux/utsname.h> +#include <linux/wait.h> #include <linux/sunrpc/clnt.h> #include <linux/workqueue.h>
@@ -222,6 +223,7 @@ out_no_clnt:int rpc_shutdown_client (struct rpc_clnt *clnt) { +DEFINE_WAIT (wait);dprintk ("RPC: shutting down %s client for %s, tasks=%d\n" , clnt->cl_protname, clnt->cl_server,atomic_read (&clnt->cl_users));
@@ -231,7 +233,9 @@ 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 ); +prepare_to_wait (&destroy_wait, &wait,TASK_UNINTERRUPTIBLE ); +schedule_timeout (HZ ); +finish_wait (&destroy_wait, &wait); }if (atomic_read (&clnt->cl_users) <0 ) {
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors