aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/zfs_sa.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-05-12 13:31:55 -0700
committerBrian Behlendorf <[email protected]>2016-05-12 13:36:22 -0700
commitc15706490e5d018542ab4bef1a5ab83122a4b351 (patch)
treee2f489c01230583881cdab63d85c87cddf386f61 /module/zfs/zfs_sa.c
parent193a37cb2430960ce759daf12ce5cc804818aba1 (diff)
Revert "Kill znode->z_gen field"
This reverts commit 4cd77889b684fd0dd1a0a995b692dda3db76a9ac. The i_generation field in the inode is 32-bit and the SA code expects 64-bit fixed values. Revert this optimization for now until this is cleanly addressed. Signed-off-by: Brian Behlendorf <[email protected]> Issue #4538
Diffstat (limited to 'module/zfs/zfs_sa.c')
-rw-r--r--module/zfs/zfs_sa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zfs_sa.c b/module/zfs/zfs_sa.c
index 2c0297e55..98e6185cf 100644
--- a/module/zfs/zfs_sa.c
+++ b/module/zfs/zfs_sa.c
@@ -337,7 +337,7 @@ zfs_sa_upgrade(sa_handle_t *hdl, dmu_tx_t *tx)
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_SIZE(zsb), NULL,
&zp->z_size, 8);
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_GEN(zsb),
- NULL, &(ZTOI(zp)->i_generation), 8);
+ NULL, &zp->z_gen, 8);
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_UID(zsb), NULL, &uid, 8);
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_GID(zsb), NULL, &gid, 8);
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_PARENT(zsb),