[patch 4/7] fs/clntproc: replace schedule_timeout() with msleep_interruptible()

[domen@coderock.org]

[-- Attachment #1: msleep_interruptible-fs_lockd_clntproc.patch --]
[-- Type: text/plain, Size: 1091 bytes --]

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



Use msleep_interruptible() instead of schedule_timeout(). The
existing code is not incorrect, but msleep_interruptible() offers two
advantages: 1) consistency across the kernel and 2) human-sensible time units
(msecs).

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 clntproc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: quilt/fs/lockd/clntproc.c
===================================================================
--- quilt.orig/fs/lockd/clntproc.c
+++ quilt/fs/lockd/clntproc.c
@@ -14,6 +14,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/utsname.h>
 #include <linux/smp_lock.h>
+#include <linux/delay.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
@@ -298,8 +299,7 @@ nlmclnt_alloc_call(void)
 			return call;
 		}
 		printk("nlmclnt_alloc_call: failed, waiting for memory\n");
-		current->state = TASK_INTERRUPTIBLE;
-		schedule_timeout(5*HZ);
+		msleep_interruptible(5000);
 	}
 	return NULL;
 }

--