diff options
| author | rees <rees@FreeBSD.org> | 2004-02-21 22:10:35 +0000 |
|---|---|---|
| committer | rees <rees@FreeBSD.org> | 2004-02-21 22:10:35 +0000 |
| commit | 588863d371a3553d8888a2c2e24504aa72ce63dc (patch) | |
| tree | 4040e738680c97d3ce3dd9de67fab4c1bb6750e8 /sys/nfs4client | |
| parent | 923e33764d482973e5f6470b79e05598eadea009 (diff) | |
| download | FreeBSD-src-588863d371a3553d8888a2c2e24504aa72ce63dc.zip FreeBSD-src-588863d371a3553d8888a2c2e24504aa72ce63dc.tar.gz | |
ask for rdattr_err in readdir, so we won't fail the readdir if we can't get
attrs on one or more entries
Diffstat (limited to 'sys/nfs4client')
| -rw-r--r-- | sys/nfs4client/nfs4_subs.c | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/sys/nfs4client/nfs4_subs.c b/sys/nfs4client/nfs4_subs.c index fd235ae..c28c73b 100644 --- a/sys/nfs4client/nfs4_subs.c +++ b/sys/nfs4client/nfs4_subs.c @@ -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); |
