diff options
author | phk <phk@FreeBSD.org> | 1996-06-14 11:13:21 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1996-06-14 11:13:21 +0000 |
commit | ea659e907a04a78bd9177cf580b96c30fd471db3 (patch) | |
tree | 5ced02520e76d56e1eb1c52376ef25a03b02891b /sys/nfsclient/nfs_subs.c | |
parent | de013e282df86ab6d2bfe323425f4bf6f00220f9 (diff) | |
download | FreeBSD-src-ea659e907a04a78bd9177cf580b96c30fd471db3.zip FreeBSD-src-ea659e907a04a78bd9177cf580b96c30fd471db3.tar.gz |
Fix for NFS_NOSERVER
Poul mentioned that he thought this was some kind of timing problem, and
that started me thinking. After a little poking around, I found that
nfs_timer() was completely disabled when NFS_NOSERVER was #defined.
But after looking at nfs_timer(), it seemed like it was something
required by both the client and server code, and disabling it outright
just didn't seem to make any sense. Parts of it relate only to the
NFS server side code, so I disabled those, but I re-enabled the rest
of the function and made sure that it would be called from nfs_init()
(in nfs_subs.c).
With nfs_timer() re-enabled, everything seems to work again. The only
other changes I made were to #ifdef away some variable declarations
in the NFS_NOSERVER case so that gcc would stop complaining about
unused variables.
Reviewed by: phk
Submitted by: Bill Paul <wpaul@skynet.ctr.columbia.edu>
Diffstat (limited to 'sys/nfsclient/nfs_subs.c')
-rw-r--r-- | sys/nfsclient/nfs_subs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index f0c670c..9f5215f 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.27 1996/01/13 23:27:56 phk Exp $ + * $Id: nfs_subs.c,v 1.28 1996/01/19 03:58:52 dyson Exp $ */ /* @@ -1147,9 +1147,9 @@ nfs_init() * Initialize reply list and start timer */ TAILQ_INIT(&nfs_reqq); -#ifndef NFS_NOSERVER + nfs_timer(0); -#endif + #ifdef __FreeBSD__ /* |