summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_serv.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-05-31 19:10:52 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-05-31 19:10:52 +0000
commita422fed096387a57f191a1b52d64aaae64d0ccb5 (patch)
tree5f88012df24320bc04f303b9991e9166db1466bd /sys/nfs/nfs_serv.c
parentc03d64df191c8628a1dc46d074dfea80a51fbb3c (diff)
Notes
Diffstat (limited to 'sys/nfs/nfs_serv.c')
-rw-r--r--sys/nfs/nfs_serv.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index e11899fbbcd2..03a3dad4d6e1 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.64 1998/05/31 17:54:18 peter Exp $
+ * $Id: nfs_serv.c,v 1.65 1998/05/31 19:07:47 peter Exp $
*/
/*
@@ -2650,7 +2650,8 @@ again:
* increase.
*/
while (cpos < cend && ncookies > 0 &&
- (dp->d_fileno == 0 || ((u_quad_t)(*cookiep)) <= toff)) {
+ (dp->d_fileno == 0 || dp->d_type == DT_WHT ||
+ ((u_quad_t)(*cookiep)) <= toff)) {
cpos += dp->d_reclen;
dp = (struct dirent *)cpos;
cookiep++;
@@ -2675,7 +2676,7 @@ again:
/* Loop through the records and build reply */
while (cpos < cend && ncookies > 0) {
- if (dp->d_fileno != 0) {
+ if (dp->d_fileno != 0 && dp->d_type != DT_WHT) {
nlen = dp->d_namlen;
rem = nfsm_rndup(nlen)-nlen;
len += (4 * NFSX_UNSIGNED + nlen + rem);
@@ -2907,7 +2908,8 @@ again:
* increase.
*/
while (cpos < cend && ncookies > 0 &&
- (dp->d_fileno == 0 || ((u_quad_t)(*cookiep)) <= toff)) {
+ (dp->d_fileno == 0 || dp->d_type == DT_WHT) ||
+ ((u_quad_t)(*cookiep)) <= toff)) {
cpos += dp->d_reclen;
dp = (struct dirent *)cpos;
cookiep++;
@@ -2945,7 +2947,7 @@ again:
/* Loop through the records and build reply */
while (cpos < cend && ncookies > 0) {
- if (dp->d_fileno != 0) {
+ if (dp->d_fileno != 0 && dp->d_type != DT_WHT) {
nlen = dp->d_namlen;
rem = nfsm_rndup(nlen)-nlen;