Author: rmacklem
Date: Wed Dec 31 01:38:02 2014
New Revision: 276442
URL: https://svnweb.freebsd.org/changeset/base/276442

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/9/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clvnops.c     Wed Dec 31 01:34:37 2014        
(r276441)
+++ stable/9/sys/fs/nfsclient/nfs_clvnops.c     Wed Dec 31 01:38:02 2014        
(r276442)
@@ -1583,20 +1583,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 ||
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to