Delete some duplicate code that was harmless because

exactly the same code is at the end of the nfscl_checksattr()
function that is called just before it. As such, this code
had already been executed and didn't do anything.

MFC after:	1 week
This commit is contained in:
rmacklem 2014-12-25 22:29:37 +00:00
parent 9504085abf
commit 4818055005

View File

@ -1606,20 +1606,6 @@ nfs_create(struct vop_create_args *ap)
}
} else if (NFS_ISV34(dvp) && (fmode & O_EXCL)) {
if (nfscl_checksattr(vap, &nfsva)) {
/*
* We are normally called with only a partially
* initialized VAP. Since the NFSv3 spec says that
* the server may use the file attributes to
* store the verifier, the spec requires us to do a
* SETATTR RPC. FreeBSD servers store the verifier in
* atime, but we can't really assume that all servers
* will so we ensure that our SETATTR sets both atime
* and mtime.
*/
if (vap->va_mtime.tv_sec == VNOVAL)
vfs_timestamp(&vap->va_mtime);
if (vap->va_atime.tv_sec == VNOVAL)
vap->va_atime = vap->va_mtime;
error = nfsrpc_setattr(newvp, vap, NULL, cnp->cn_cred,
cnp->cn_thread, &nfsva, &attrflag, NULL);
if (error && (vap->va_uid != (uid_t)VNOVAL ||