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

Fix the NFSv4 client so that it checks for support of TimeCreate before

Browse Source 
trying to set it.

r362490 added support for setting of the TimeCreate (va_birthtime) attribute,
but it does so without checking to see if the server supports the attribute.
This could result in NFSERR_ATTRNOTSUPP error replies to the Setattr operation.
This patch adds code to check that the server supports TimeCreate before
attempting to do a Setattr of it to avoid these error returns.
This commit is contained in:
Rick Macklem 2020-07-26 23:13:10 +00:00
parent 2de592f6e1
commit 194d870481
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/fs/nfs/nfs_commonsubs.c
View File

@ -504,6 +504,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap,
u_int32_t *tl;
struct nfsv2_sattr *sp;
nfsattrbit_t attrbits;
struct nfsnode *np;
switch (nd->nd_flag & (ND_NFSV2 | ND_NFSV3 | ND_NFSV4)) {
case ND_NFSV2:
@ -605,8 +606,18 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap,
NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMEACCESSSET);
if (vap->va_mtime.tv_sec != VNOVAL)
NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMEMODIFYSET);
if (vap->va_birthtime.tv_sec != VNOVAL)
NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE);
if (vap->va_birthtime.tv_sec != VNOVAL &&
strcmp(vp->v_mount->mnt_vfc->vfc_name, "nfs") == 0) {
/*
* We can only test for support of TimeCreate if
* the "vp" argument is for an NFS vnode.
*/
np = VTONFS(vp);
if (NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr,
NFSATTRBIT_TIMECREATE))
NFSSETBIT_ATTRBIT(&attrbits,
NFSATTRBIT_TIMECREATE);
}
(void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0,
&attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL);
break;