d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ask for rdattr_err in readdir, so we won't fail the readdir if we can't get

Browse Source 
attrs on one or more entries
This commit is contained in:
Jim Rees 2004-02-21 22:10:35 +00:00
parent 70883f1d2f
commit 3a7fa52e65
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/nfs4client/nfs4_subs.c
View File

@ -108,34 +108,34 @@ nfsm_v4init(void)
{
/* Set up bitmasks */
FA4_SET(FA4_FSID, __fsinfo_bm);
FA4_SET(FA4_MAXREAD, __fsinfo_bm);
FA4_SET(FA4_MAXWRITE, __fsinfo_bm);
FA4_SET(FA4_LEASE_TIME, __fsinfo_bm);
FA4_SET(FA4_FSID, __fsinfo_bm);
FA4_SET(FA4_MAXREAD, __fsinfo_bm);
FA4_SET(FA4_MAXWRITE, __fsinfo_bm);
FA4_SET(FA4_LEASE_TIME, __fsinfo_bm);
FA4_SET(FA4_FSID, __fsattr_bm);
FA4_SET(FA4_FILES_FREE, __fsattr_bm);
FA4_SET(FA4_FILES_TOTAL, __fsattr_bm);
FA4_SET(FA4_SPACE_AVAIL, __fsattr_bm);
FA4_SET(FA4_SPACE_FREE, __fsattr_bm);
FA4_SET(FA4_SPACE_TOTAL, __fsattr_bm);
FA4_SET(FA4_FILES_FREE, __fsattr_bm);
FA4_SET(FA4_FILES_TOTAL, __fsattr_bm);
FA4_SET(FA4_SPACE_AVAIL, __fsattr_bm);
FA4_SET(FA4_SPACE_FREE, __fsattr_bm);
FA4_SET(FA4_SPACE_TOTAL, __fsattr_bm);
FA4_SET(FA4_TYPE, __getattr_bm);
FA4_SET(FA4_FSID, __getattr_bm);
FA4_SET(FA4_SIZE, __getattr_bm);
FA4_SET(FA4_MODE, __getattr_bm);
FA4_SET(FA4_RAWDEV, __getattr_bm);
FA4_SET(FA4_NUMLINKS, __getattr_bm);
FA4_SET(FA4_OWNER, __getattr_bm);
FA4_SET(FA4_OWNER_GROUP, __getattr_bm);
FA4_SET(FA4_FILEID, __getattr_bm);
FA4_SET(FA4_TIME_MODIFY, __getattr_bm);
FA4_SET(FA4_TIME_ACCESS, __getattr_bm);
/* FA4_SET(FA4_TIME_CREATE, __getattr_bm);*/
FA4_SET(FA4_FSID, __getattr_bm);
FA4_SET(FA4_SIZE, __getattr_bm);
FA4_SET(FA4_MODE, __getattr_bm);
FA4_SET(FA4_RAWDEV, __getattr_bm);
FA4_SET(FA4_NUMLINKS, __getattr_bm);
FA4_SET(FA4_OWNER, __getattr_bm);
FA4_SET(FA4_OWNER_GROUP, __getattr_bm);
FA4_SET(FA4_FILEID, __getattr_bm);
FA4_SET(FA4_TIME_MODIFY, __getattr_bm);
FA4_SET(FA4_TIME_ACCESS, __getattr_bm);
FA4_SET(FA4_TYPE, __readdir_bm);
FA4_SET(FA4_FSID, __readdir_bm);
FA4_SET(FA4_FILEID, __readdir_bm);
FA4_SET(FA4_FILEID, __readdir_bm);
FA4_SET(FA4_RDATTR_ERROR, __readdir_bm);
}
/*
@ -1219,6 +1219,12 @@ nfsm_v4dissect_attrs_xx(struct nfsv4_fattr *fa, struct mbuf **md, caddr_t *dpos)
fa->fa4_valid |= FA4V_LEASE_TIME;
len += NFSX_UNSIGNED;
}
if (FA4_ISSET(FA4_RDATTR_ERROR, bmval)) {
/* ignore for now; we only ask for it so the compound won't fail */
NFSM_DISSECT(NFSX_UNSIGNED);
tl++;
len += NFSX_UNSIGNED;
}
if (FA4_ISSET(FA4_FILEID, bmval)) {
NFSM_DISSECT(2 * NFSX_UNSIGNED);
fa->fa4_fileid = fxdr_hyper(tl);