diff options
| author | phk <phk@FreeBSD.org> | 1997-09-10 19:52:27 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-09-10 19:52:27 +0000 |
| commit | 4d0f72e0e25cb52d81ff2dfec572ad57269f7255 (patch) | |
| tree | 60645a256c28dd6f2dfb473b58187fa055860e05 /sys/nfs/nfs_serv.c | |
| parent | 8e20f7ec0eb58e4adf6aaa2f3a9ca01a9bce42c4 (diff) | |
| download | FreeBSD-src-4d0f72e0e25cb52d81ff2dfec572ad57269f7255.zip FreeBSD-src-4d0f72e0e25cb52d81ff2dfec572ad57269f7255.tar.gz | |
unifdef -U__NetBSD__ -D__FreeBSD__
Diffstat (limited to 'sys/nfs/nfs_serv.c')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 30d9128..66d6467 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.47 1997/08/16 19:15:56 wollman Exp $ + * $Id: nfs_serv.c,v 1.48 1997/09/02 01:19:33 bde Exp $ */ /* @@ -2594,11 +2594,6 @@ nfsrv_readdir(nfsd, slp, procp, mrq) } VOP_UNLOCK(vp, 0, procp); MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK); -#ifdef __NetBSD__ - ncookies = siz / (5 * NFSX_UNSIGNED); /*7 for V3, but it's an est. so*/ - MALLOC(cookies, u_long *, ncookies * sizeof (u_long *), M_TEMP, - M_WAITOK); -#endif again: iv.iov_base = rbuf; iv.iov_len = fullsiz; @@ -2668,7 +2663,6 @@ again: cend = rbuf + siz; dp = (struct dirent *)cpos; cookiep = cookies; -#ifdef __FreeBSD__ /* * For some reason FreeBSD's ufs_readdir() chooses to back the * directory offset up to a block boundary, so it is necessary to @@ -2678,9 +2672,6 @@ again: */ while (cpos < cend && ncookies > 0 && (dp->d_fileno == 0 || ((u_quad_t)(*cookiep)) <= toff)) { -#else - while (dp->d_fileno == 0 && cpos < cend && ncookies > 0) { -#endif cpos += dp->d_reclen; dp = (struct dirent *)cpos; cookiep++; @@ -2857,11 +2848,6 @@ nfsrv_readdirplus(nfsd, slp, procp, mrq) } VOP_UNLOCK(vp, 0, procp); MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK); -#ifdef __NetBSD__ - ncookies = siz / (7 * NFSX_UNSIGNED); - MALLOC(cookies, u_long *, ncookies * sizeof (u_long *), M_TEMP, - M_WAITOK); -#endif again: iv.iov_base = rbuf; iv.iov_len = fullsiz; @@ -2926,7 +2912,6 @@ again: cend = rbuf + siz; dp = (struct dirent *)cpos; cookiep = cookies; -#ifdef __FreeBSD__ /* * For some reason FreeBSD's ufs_readdir() chooses to back the * directory offset up to a block boundary, so it is necessary to @@ -2936,9 +2921,6 @@ again: */ while (cpos < cend && ncookies > 0 && (dp->d_fileno == 0 || ((u_quad_t)(*cookiep)) <= toff)) { -#else - while (dp->d_fileno == 0 && cpos < cend && ncookies > 0) { -#endif cpos += dp->d_reclen; dp = (struct dirent *)cpos; cookiep++; |
