svn commit: r316391 - in stable/11/sys/cddl/contrib/opensolaris/uts/common: fs/zfs sys

[Alan Somers]

Author: asomers
Date: Sun Apr  2 03:08:25 2017
New Revision: 316391
URL: https://svnweb.freebsd.org/changeset/base/316391

Log:
  MFC r313483:
  
  Fix setting birthtime in ZFS
  
  sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  	* In zfs_freebsd_setattr, if the caller wants to set the birthtime,
  	  set the bits that zfs_settattr expects
  
  	* In zfs_setattr, if XAT_CREATETIME is set, set xoa_createtime,
  	  expected by zfs_xvattr_set.  The two levels of indirection seem
  	  excessive, but it minimizes diffs vs OpenZFS.
  
  	* In zfs_setattr, check for overflow of va_birthtime (from delphij)
  
  	* Remove red herring in zfs_getattr
  
  sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
  	* Un-booby-trap some macros
  
  New tests are under review at https://github.com/pjd/pjdfstest/pull/6
  
  Reviewed by:	avg
  MFC after:	3 weeks
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D9353

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Apr  2 03:00:50 2017	(r316390)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Apr  2 03:08:25 2017	(r316391)
@@ -2797,15 +2797,6 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, i
 			zfs_sa_get_scanstamp(zp, xvap);
 		}
 
-		if (XVA_ISSET_REQ(xvap, XAT_CREATETIME)) {
-			uint64_t times[2];
-
-			(void) sa_lookup(zp->z_sa_hdl, SA_ZPL_CRTIME(zfsvfs),
-			    times, sizeof (times));
-			ZFS_TIME_DECODE(&xoap->xoa_createtime, times);
-			XVA_SET_RTN(xvap, XAT_CREATETIME);
-		}
-
 		if (XVA_ISSET_REQ(xvap, XAT_REPARSE)) {
 			xoap->xoa_reparse = ((zp->z_pflags & ZFS_REPARSE) != 0);
 			XVA_SET_RTN(xvap, XAT_REPARSE);
@@ -2967,6 +2958,11 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, i
 			return (SET_ERROR(EOVERFLOW));
 		}
 	}
+	if (xoap && (mask & AT_XVATTR) && XVA_ISSET_REQ(xvap, XAT_CREATETIME) &&
+	    TIMESPEC_OVERFLOW(&vap->va_birthtime)) {
+		ZFS_EXIT(zfsvfs);
+		return (SET_ERROR(EOVERFLOW));
+	}
 
 	attrzp = NULL;
 	aclp = NULL;
@@ -3411,6 +3407,8 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, i
 
 	if (xoap && (mask & AT_XVATTR)) {
 
+		if (XVA_ISSET_REQ(xvap, XAT_CREATETIME))
+			xoap->xoa_createtime = vap->va_birthtime;
 		/*
 		 * restore trimmed off masks
 		 * so that return masks can be set for caller.
@@ -5262,6 +5260,10 @@ zfs_freebsd_setattr(ap)
 		    xvap.xva_xoptattrs.xoa_sparse);
 #undef	FLAG_CHANGE
 	}
+	if (vap->va_birthtime.tv_sec != VNOVAL) {
+		xvap.xva_vattr.va_mask |= AT_XVATTR;
+		XVA_SET_REQ(&xvap, XAT_CREATETIME);
+	}
 	return (zfs_setattr(vp, (vattr_t *)&xvap, 0, cred, NULL));
 }
 

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h	Sun Apr  2 03:00:50 2017	(r316390)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h	Sun Apr  2 03:08:25 2017	(r316391)
@@ -268,27 +268,30 @@ typedef struct xvattr {
  * XVA_SET_REQ() sets an attribute bit in the proper element in the bitmap
  * of requested attributes (xva_reqattrmap[]).
  */
-#define	XVA_SET_REQ(xvap, attr)					\
+#define	XVA_SET_REQ(xvap, attr)	{				\
 	ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR);		\
 	ASSERT((xvap)->xva_magic == XVA_MAGIC);			\
-	(xvap)->xva_reqattrmap[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr)
+	(xvap)->xva_reqattrmap[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr); \
+}
 /*
  * XVA_CLR_REQ() clears an attribute bit in the proper element in the bitmap
  * of requested attributes (xva_reqattrmap[]).
  */
-#define	XVA_CLR_REQ(xvap, attr)					\
+#define	XVA_CLR_REQ(xvap, attr)	{				\
 	ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR);		\
 	ASSERT((xvap)->xva_magic == XVA_MAGIC);			\
-	(xvap)->xva_reqattrmap[XVA_INDEX(attr)] &= ~XVA_ATTRBIT(attr)
+	(xvap)->xva_reqattrmap[XVA_INDEX(attr)] &= ~XVA_ATTRBIT(attr); \
+}
 
 /*
  * XVA_SET_RTN() sets an attribute bit in the proper element in the bitmap
  * of returned attributes (xva_rtnattrmap[]).
  */
-#define	XVA_SET_RTN(xvap, attr)					\
+#define	XVA_SET_RTN(xvap, attr)	{				\
 	ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR);		\
 	ASSERT((xvap)->xva_magic == XVA_MAGIC);			\
-	(XVA_RTNATTRMAP(xvap))[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr)
+	(XVA_RTNATTRMAP(xvap))[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr); \
+}
 
 /*
  * XVA_ISSET_REQ() checks the requested attribute bitmap (xva_reqattrmap[])