[patch 5/7] lockd/svc: remove interruptible_sleep_on_timeout() usage

[patch 5/7] lockd/svc: remove interruptible_sleep_on_timeout() usage

[domen]

[-- Attachment #1: int_sleep_on-fs_lockd_svc.patch --]
[-- Type: text/plain, Size: 1223 bytes --]

From: Nishanth Aravamudan <nacc@us.ibm.com>



Replace deprecated interruptible_sleep_on_timeout() with direct
wait-queue usage. Patch is compile-tested.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 svc.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: quilt/fs/lockd/svc.c
===================================================================
--- quilt.orig/fs/lockd/svc.c
+++ quilt/fs/lockd/svc.c
@@ -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");

--