patch-2.2.0-pre5 linux/fs/lockd/clntlock.c

• Lines: 14
• Date: Mon Jan 4 10:23:42 1999
• Orig file: v2.2.0-pre4/linux/fs/lockd/clntlock.c
• Orig date: Sun Nov 8 14:03:06 1998

diff -u --recursive --new-file v2.2.0-pre4/linux/fs/lockd/clntlock.c linux/fs/lockd/clntlock.c
@@ -71,12 +71,7 @@
 	 * a 1 minute timeout would do. See the comment before
 	 * nlmclnt_lock for an explanation.
 	 */
-	/*
-	 * FIXME, can we be not interruptible and so be allowed to use
-	 * a timeout here? -arca
-	 */
-/*  	current->timeout = jiffies + 30 * HZ; */
-	sleep_on(&block.b_wait);
+	sleep_on_timeout(&block.b_wait, 30*HZ);
 
 	for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
 		if (*head == &block) {