Author: rmacklem
Date: Sat May 23 21:58:41 2015
New Revision: 283330
URL: https://svnweb.freebsd.org/changeset/base/283330
Log:
The NFS client generated directory block(s) with d_fileno == 0
so that it would not return less data than requested.
Since returning less directory data than requested is not a problem
for FreeBSD and even UFS no longer returns directory structures
with d_fileno == 0, this patch stops the client from doing this.
Although entries with d_fileno == 0 should not be a problem,
the man pages no longer document that these entries should be
ignored, so there was a concern that these entries might be an
issue in the future.
Suggested by: trasz
Tested by: trasz
MFC after: 2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Sat May 23 21:12:51 2015
(r283329)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Sat May 23 21:58:41 2015
(r283330)
@@ -3072,25 +3072,6 @@ nfsrpc_readdir(vnode_t vp, struct uio *u
*eofp = eof;
}
- /*
- * Add extra empty records to any remaining DIRBLKSIZ chunks.
- */
- while (uio_uio_resid(uiop) > 0 && ((size_t)(uio_uio_resid(uiop))) !=
tresid) {
- dp = (struct dirent *) CAST_DOWN(caddr_t, uio_iov_base(uiop));
- dp->d_type = DT_UNKNOWN;
- dp->d_fileno = 0;
- dp->d_namlen = 0;
- dp->d_name[0] = '\0';
- tl = (u_int32_t *)&dp->d_name[4];
- *tl++ = cookie.lval[0];
- *tl = cookie.lval[1];
- dp->d_reclen = DIRBLKSIZ;
- uio_iov_base_add(uiop, DIRBLKSIZ);
- uio_iov_len_add(uiop, -(DIRBLKSIZ));
- uio_uio_resid_add(uiop, -(DIRBLKSIZ));
- uiop->uio_offset += DIRBLKSIZ;
- }
-
nfsmout:
if (nd->nd_mrep != NULL)
mbuf_freem(nd->nd_mrep);
@@ -3565,25 +3546,6 @@ nfsrpc_readdirplus(vnode_t vp, struct ui
*eofp = eof;
}
- /*
- * Add extra empty records to any remaining DIRBLKSIZ chunks.
- */
- while (uio_uio_resid(uiop) > 0 && uio_uio_resid(uiop) != tresid) {
- dp = (struct dirent *)uio_iov_base(uiop);
- dp->d_type = DT_UNKNOWN;
- dp->d_fileno = 0;
- dp->d_namlen = 0;
- dp->d_name[0] = '\0';
- tl = (u_int32_t *)&dp->d_name[4];
- *tl++ = cookie.lval[0];
- *tl = cookie.lval[1];
- dp->d_reclen = DIRBLKSIZ;
- uio_iov_base_add(uiop, DIRBLKSIZ);
- uio_iov_len_add(uiop, -(DIRBLKSIZ));
- uio_uio_resid_add(uiop, -(DIRBLKSIZ));
- uiop->uio_offset += DIRBLKSIZ;
- }
-
nfsmout:
if (nd->nd_mrep != NULL)
mbuf_freem(nd->nd_mrep);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
