From: Nishanth Aravamudan <nacc@us.ibm.com>
Subject: [KJ] [PATCH] fs/clntlock: remove sleep_on*() usage


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 <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 clntlock.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: quilt/fs/lockd/clntlock.c
===================================================================
--- quilt.orig/fs/lockd/clntlock.c
+++ quilt/fs/lockd/clntlock.c
@@ -14,6 +14,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 #include <linux/smp_lock.h>
+#include <linux/wait.h>
 
 #define NLMDBG_FACILITY		NLMDBG_CLIENT
 
@@ -47,6 +48,7 @@ static struct nlm_wait *	nlm_blocked;
 int
 nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp)
 {
+	DEFINE_WAIT(wait);
 	struct nlm_wait	block, **head;
 	int		err;
 	u32		pstate;
@@ -69,7 +71,9 @@ nlmclnt_block(struct nlm_host *host, str
 	 * a 1 minute timeout would do. See the comment before
 	 * nlmclnt_lock for an explanation.
 	 */
-	sleep_on_timeout(&block.b_wait, 30*HZ);
+	prepare_to_wait(&block.b_wait, &wait, TASK_UNINTERRUPTIBLE);
+	schedule_timeout(30*HZ);
+	finish_wait(&block.b_wait, &wait);
 
 	for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
 		if (*head == &block) {