--- linux/fs/ncpfs/sock.127-7 Fri Nov 6 11:13:08 1998
+++ linux/fs/ncpfs/sock.c Fri Nov 6 11:16:42 1998
@@ -182,17 +182,16 @@
}
timeout = max_timeout;
}
- current->timeout = jiffies + timeout;
- schedule();
+ schedule_timeout(timeout);
remove_wait_queue(entry.wait_address, &entry.wait);
fput(file);
current->state = TASK_RUNNING;
if (signal_pending(current)) {
- current->timeout = 0;
+ schedule_timeout(0);
result = -ERESTARTSYS;
break;
}
- if (!current->timeout) {
+ if (!schedule_timeout(timeout)) {
if (n < retrans)
continue;
if (server->m.flags & NCP_MOUNT_SOFT) {
@@ -209,7 +208,7 @@
major_timeout_seen = 1;
continue;
} else
- current->timeout = 0;
+ schedule_timeout(0);
} else if (wait_table.nr) {
remove_wait_queue(entry.wait_address, &entry.wait);
fput(file);
*** END PATCH ***
--------------------------------------------------
Matthew G. Marsh, President
Paktronix Systems LLC
1506 North 59th Street
Omaha NE 68104
Phone: (402) 932-7250
Email: mgm@paktronix.com
WWW: http://www.paktronix.com
--------------------------------------------------
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/