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

Next file: linux/fs/lockd/clntproc.c
Previous file: linux/fs/hfs/version.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.126/linux/fs/lockd/clntlock.c linux/fs/lockd/clntlock.c
@@ -71,7 +71,11 @@
 	 * a 1 minute timeout would do. See the comment before
 	 * nlmclnt_lock for an explanation.
 	 */
-	current->timeout = jiffies + 30 * HZ;
+	/*
+	 * 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);
 
 	for (head = &nlm_blocked; *head; head = &(*head)->b_next) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov