diff options
| author | Brian Behlendorf <[email protected]> | 2016-05-12 13:31:55 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-12 13:36:22 -0700 |
| commit | c15706490e5d018542ab4bef1a5ab83122a4b351 (patch) | |
| tree | e2f489c01230583881cdab63d85c87cddf386f61 /include/sys/trace_acl.h | |
| parent | 193a37cb2430960ce759daf12ce5cc804818aba1 (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 'include/sys/trace_acl.h')
| -rw-r--r-- | include/sys/trace_acl.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h index 46ca4686b..87ffecb4e 100644 --- a/include/sys/trace_acl.h +++ b/include/sys/trace_acl.h @@ -54,6 +54,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __field(uint_t, z_blksz) __field(uint_t, z_seq) __field(uint64_t, z_mapcnt) + __field(uint64_t, z_gen) __field(uint64_t, z_size) __field(uint64_t, z_links) __field(uint64_t, z_pflags) @@ -91,6 +92,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __entry->z_blksz = zn->z_blksz; __entry->z_seq = zn->z_seq; __entry->z_mapcnt = zn->z_mapcnt; + __entry->z_gen = zn->z_gen; __entry->z_size = zn->z_size; __entry->z_links = zn->z_links; __entry->z_pflags = zn->z_pflags; @@ -121,15 +123,17 @@ DECLARE_EVENT_CLASS(zfs_ace_class, ), TP_printk("zn { id %llu unlinked %u atime_dirty %u " "zn_prefetch %u moved %u blksz %u seq %u " - "mapcnt %llu size %llu links %llu pflags %llu " - "uid %llu gid %llu sync_cnt %u mode 0x%x is_sa %d " - "is_zvol %d is_mapped %d is_ctldir %d is_stale %d " - "inode { ino %lu nlink %u version %llu size %lli " - "blkbits %u bytes %u mode 0x%x generation %x } } " - "ace { type %u flags %u access_mask %u } mask_matched %u", + "mapcnt %llu gen %llu size %llu " + "links %llu pflags %llu uid %llu gid %llu " + "sync_cnt %u mode 0x%x is_sa %d is_zvol %d " + "is_mapped %d is_ctldir %d is_stale %d inode { " + "ino %lu nlink %u version %llu size %lli blkbits %u " + "bytes %u mode 0x%x generation %x } } ace { type %u " + "flags %u access_mask %u } mask_matched %u", __entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty, __entry->z_zn_prefetch, __entry->z_moved, __entry->z_blksz, - __entry->z_seq, __entry->z_mapcnt, __entry->z_size, + __entry->z_seq, __entry->z_mapcnt, __entry->z_gen, + __entry->z_size, __entry->z_links, __entry->z_pflags, __entry->z_uid, __entry->z_gid, __entry->z_sync_cnt, __entry->z_mode, __entry->z_is_sa, __entry->z_is_zvol, __entry->z_is_mapped, |