Page MenuHomeFreeBSD
Files F110228979

D9353.diff
No OneTemporary
Actions

D9353.diff
View Options

Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -2786,15 +2786,6 @@
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);
@@ -2956,6 +2947,11 @@
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;
@@ -3400,6 +3396,8 @@
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.
@@ -5251,6 +5249,10 @@
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));
}
Index: head/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
@@ -268,27 +268,30 @@
* 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[])

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 16, 10:36 AM (15 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16672696
Default Alt Text
D9353.diff (3 KB)

Event Timeline