Re: compilation problems with ncpfs

Matthew G. Marsh (mgm@paktronix.com)
Sat, 7 Nov 1998 16:29:12 +0000 (/etc/localtime)


On Fri, 6 Nov 1998, James Curbo wrote:

> This seems related to the whole schedule_timeout/jiffies thing. Anyone
> else noticed this? This is 2.1.127pre7 with arca-10 applied.

Yes - I posted a patch to the list (enclosed).

> This is with ncpfs being built in.
> Rest of config available upon request.
> --
> James Curbo computer science/math undergradute
> Henderson State University Department of Computer Science
> jc108788@cyprus.hsu.edu james@mousehole.sandwich.net
> http://users.ipa.net/~jcurbo/index.html

Patch:

--- 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);

--------------------------------------------------
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/