summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/zfs_znode.c
diff options
context:
space:
mode:
authorMark Shellenbaum <Mark.Shellenbaum@Sun.COM>2010-05-12 10:22:27 -0600
committerMark Shellenbaum <Mark.Shellenbaum@Sun.COM>2010-05-12 10:22:27 -0600
commitdb9986c78dc7730f3091d7780ef0ba0937183a24 (patch)
tree8d2b9a45d070524ab56ed5888d3e1a3a9ade714d /usr/src/uts/common/fs/zfs/zfs_znode.c
parentd34083bdb88c46438e20789b3e42044428239a21 (diff)
downloadillumos-gate-db9986c78dc7730f3091d7780ef0ba0937183a24.tar.gz
6950273 CIFS attributes aren't always updated when timestamps are updated
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_znode.c')
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_znode.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c
index 6d5a3f645f..24bd3ddcdd 100644
--- a/usr/src/uts/common/fs/zfs/zfs_znode.c
+++ b/usr/src/uts/common/fs/zfs/zfs_znode.c
@@ -1654,7 +1654,7 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
zilog_t *zilog = zfsvfs->z_log;
uint64_t mode;
uint64_t mtime[2], ctime[2];
- sa_bulk_attr_t bulk[2];
+ sa_bulk_attr_t bulk[3];
int count = 0;
int error;
@@ -1706,6 +1706,8 @@ log:
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, mtime, 16);
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, ctime, 16);
+ SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_FLAGS(zfsvfs),
+ NULL, &zp->z_pflags, 8);
zfs_tstamp_update_setup(zp, CONTENT_MODIFIED, mtime, ctime, B_TRUE);
error = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx);
ASSERT(error == 0);