diff options
| author | peter <peter@FreeBSD.org> | 1999-06-05 05:35:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-06-05 05:35:03 +0000 |
| commit | 21732dea0c4943518e727150906d9117775a8a6b (patch) | |
| tree | 99f7e98fb0f17e44493e65e48edc712f1686eb56 /sys/nfs/nfs_nqlease.c | |
| parent | 06a6a667a6bf7a90688c9b4f6a3bac0a4f01a1c6 (diff) | |
| download | FreeBSD-src-21732dea0c4943518e727150906d9117775a8a6b.zip FreeBSD-src-21732dea0c4943518e727150906d9117775a8a6b.tar.gz | |
Various changes lifted from the OpenBSD cvs tree:
txdr_hyper and fxdr_hyper tweaks to avoid excessive CPU order knowledge.
nfs_serv.c: don't call nfsm_adj() with negative values, windows clients
could crash servers when doing a readdir of a large directory.
nfs_socket.c: Use IP_PORTRANGE to get a priviliged port without a spin
loop trying to bind(). Don't clobber a mbuf pointer or we get panics
on a NFS3ERR_JUKEBOX error from a server when reusing a freed mbuf.
nfs_subs.c: Don't loose st_blocks on NFSv2 mounts when > 2GB.
Obtained from: OpenBSD
Diffstat (limited to 'sys/nfs/nfs_nqlease.c')
| -rw-r--r-- | sys/nfs/nfs_nqlease.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index e45c73f..3fcfaca 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 - * $Id: nfs_nqlease.c,v 1.40 1999/02/25 00:03:51 peter Exp $ + * $Id: nfs_nqlease.c,v 1.41 1999/05/02 23:56:24 alc Exp $ */ @@ -772,7 +772,7 @@ nqnfsrv_getlease(nfsd, slp, procp, mrq) nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(cache); *tl++ = txdr_unsigned(nfsd->nd_duration); - txdr_hyper(&frev, tl); + txdr_hyper(frev, tl); nfsm_build(fp, struct nfs_fattr *, NFSX_V3FATTR); nfsm_srvfillattr(vap, fp); nfsm_srvdone; @@ -893,7 +893,7 @@ nqnfs_getlease(vp, rwflag, cred, p) cachable = fxdr_unsigned(int, *tl++); reqtime += fxdr_unsigned(int, *tl++); if (reqtime > time_second) { - fxdr_hyper(tl, &frev); + frev = fxdr_hyper(tl); nqnfs_clientlease(nmp, np, rwflag, cachable, reqtime, frev); nfsm_loadattr(vp, (struct vattr *)0); } else |
