svn commit: r276438 - stable/10/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Wed Dec 31 00:44:11 2014
New Revision: 276438
URL: https://svnweb.freebsd.org/changeset/base/276438

Log:
  MFC: r276221
  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.

Modified:
  stable/10/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clvnops.c	Wed Dec 31 00:40:10 2014	(r276437)
+++ stable/10/sys/fs/nfsclient/nfs_clvnops.c	Wed Dec 31 00:44:11 2014	(r276438)
@@ -1608,20 +1608,6 @@ again:
 		}
 	} 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 ||