patch-2.1.127 linux/fs/smbfs/proc.c

• Lines: 23
• Date: Tue Nov 3 21:56:58 1998
• Orig file: v2.1.126/linux/fs/smbfs/proc.c
• Orig date: Thu Aug 27 19:56:30 1998

diff -u --recursive --new-file v2.1.126/linux/fs/smbfs/proc.c linux/fs/smbfs/proc.c
@@ -520,9 +520,7 @@
 	/*
 	 * Wait for the new connection.
 	 */
-	current->timeout = jiffies + 5*HZ;
-	interruptible_sleep_on(&server->wait);
-	current->timeout = 0;
+	interruptible_sleep_on_timeout(&server->wait,  5*HZ);
 	if (signal_pending(current))
 		printk("smb_retry: caught signal\n");
 
@@ -1602,10 +1600,8 @@
 				/* Windows 95 is not able to deliver answers
 				 * to FIND_NEXT fast enough, so sleep 0.2 sec
 				 */
-				current->timeout = jiffies + HZ / 5;
 				current->state = TASK_INTERRUPTIBLE;
-				schedule();
-				current->timeout = 0;
+				schedule_timeout(HZ/5);
 			}
 		}