lockd/svc: remove interruptible_sleep_on_timeout() usage

PATCH In review [email protected] 1 participant 1 message Jun 20, 2005

Subsystems (3)

VFS NFS client NFS server

lore

Share & tools

lore

[email protected]

author

2005-06-20 22:05 UTC #0 lore raw

PATCH 5/7 lockd/svc: remove interruptible_sleep_on_timeout() usage

From: Nishanth Aravamudan <[email protected]>

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

Signed-off-by Nishanth Aravamudan <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---
 svc.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

fs/lockd/svc.c +5 -1

Index: 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");