lockd/svc: remove interruptible_sleep_on_timeout() usage
Subsystems (4)
PATCH 10/20 lockd/svc: remove interruptible_sleep_on_timeout() usage
Hello,
Please consider applying.
Description: Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
fs/lockd/svc.c +5 -1
@@ -25,6 +25,7 @@#include <linux/slab.h> #include <linux/smp.h> #include <linux/smp_lock.h> +#include <linux/wait.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/stats.h>
@@ -281,6 +282,7 @@ EXPORT_SYMBOL(lockd_up);void lockd_down (void ) { +DEFINE_WAIT (wait);static int warned;down (&nlmsvc_sema);
@@ -303,7 +305,9 @@ lockd_down(void)* the lockd semaphore, we can't wait around forever ... */ clear_thread_flag (TIF_SIGPENDING ); -interruptible_sleep_on_timeout (&lockd_exit,HZ ); +prepare_to_wait (&lockd_exit, &wait,TASK_INTERRUPTIBLE ); +schedule_timeout (HZ ); +finish_wait (&lockd_exit, &wait);if (nlmsvc_pid) {printk (KERN_WARNING "lockd_down: lockd failed to exit, clearing pid\n" );
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors