diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-18 18:09:44 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-18 18:09:44 +0000 |
| commit | 14a75551ab8adecfa8504f866b3039a514eba589 (patch) | |
| tree | 97bad1a2e1e4f025760e484fea8d1a14281e6c34 /sys/nfs/nfs_serv.c | |
| parent | 3082708bb92c9b5a6ab11c44aaa464f490ba02f3 (diff) | |
Remove remaining whiteout tentacles; OK deraadt@ miod@ weingart@
Diffstat (limited to 'sys/nfs/nfs_serv.c')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 853369c71f5..049b1a3e3dc 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.38 2004/06/24 19:35:26 tholo Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.39 2005/06/18 18:09:43 millert Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -2330,8 +2330,6 @@ out: * - it trims out records with d_fileno == 0 * this doesn't matter for Unix clients, but they might confuse clients * for other os'. - * - it trims out records with d_type == DT_WHT - * these cannot be seen through NFS (unless we extend the protocol) * NB: It is tempting to set eof to true if the VOP_READDIR() reads less * than requested, but this may not apply to all filesystems. For * example, client NFS does not { although it is never remote mounted @@ -2508,8 +2506,7 @@ again: dp = (struct dirent *)cpos; cookiep = cookies; - while (cpos < cend && ncookies > 0 && - (dp->d_fileno == 0 || dp->d_type == DT_WHT)) { + while (cpos < cend && ncookies > 0 && dp->d_fileno == 0) { cpos += dp->d_reclen; dp = (struct dirent *)cpos; cookiep++; @@ -2534,7 +2531,7 @@ again: /* Loop through the records and build reply */ while (cpos < cend && ncookies > 0) { - if (dp->d_fileno != 0 && dp->d_type != DT_WHT) { + if (dp->d_fileno != 0) { nlen = dp->d_namlen; rem = nfsm_rndup(nlen)-nlen; len += (4 * NFSX_UNSIGNED + nlen + rem); @@ -2764,8 +2761,7 @@ again: dp = (struct dirent *)cpos; cookiep = cookies; - while (cpos < cend && ncookies > 0 && - (dp->d_fileno == 0 || dp->d_type == DT_WHT)) { + while (cpos < cend && ncookies > 0 && dp->d_fileno == 0) { cpos += dp->d_reclen; dp = (struct dirent *)cpos; cookiep++; @@ -2800,7 +2796,7 @@ again: /* Loop through the records and build reply */ while (cpos < cend && ncookies > 0) { - if (dp->d_fileno != 0 && dp->d_type != DT_WHT) { + if (dp->d_fileno != 0) { nlen = dp->d_namlen; rem = nfsm_rndup(nlen)-nlen; |