patch-2.1.127 linux/fs/lockd/clntproc.c

• Lines: 36
• Date: Sat Oct 31 10:17:22 1998
• Orig file: v2.1.126/linux/fs/lockd/clntproc.c
• Orig date: Wed Aug 26 11:37:41 1998

diff -u --recursive --new-file v2.1.126/linux/fs/lockd/clntproc.c linux/fs/lockd/clntproc.c
@@ -174,9 +174,9 @@
 nlmclnt_grace_wait(struct nlm_host *host)
 {
 	if (!host->h_reclaiming)
-		current->timeout = jiffies + 10 * HZ;
-	interruptible_sleep_on(&host->h_gracewait);
-	current->timeout = 0;
+		interruptible_sleep_on_timeout(&host->h_gracewait, 10*HZ);
+	else
+		interruptible_sleep_on(&host->h_gracewait);
 	return signalled()? -ERESTARTSYS : 0;
 }
 
@@ -194,10 +194,8 @@
 		if (call)
 			return call;
 		printk("nlmclnt_alloc_call: failed, waiting for memory\n");
-		current->timeout = jiffies + 5 * HZ;
 		current->state = TASK_INTERRUPTIBLE;
-		schedule();
-		current->timeout = 0;
+		schedule_timeout(5*HZ);
 	}
 	return NULL;
 }
@@ -247,9 +245,7 @@
 		}
 
 		/* Back off a little and try again */
-		current->timeout = jiffies + 15 * HZ;
-		interruptible_sleep_on(&host->h_gracewait);
-		current->timeout = 0;
+		interruptible_sleep_on_timeout(&host->h_gracewait, 15*HZ);
 	} while (!signalled());
 
 	return -ERESTARTSYS;