diff options
| author | Nikolay Borisov <[email protected]> | 2016-04-18 22:08:53 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-19 13:06:14 -0700 |
| commit | 278f2236688e70f4097e62ae93537c69968be027 (patch) | |
| tree | b6a2d1669f2d5720699af2368e3b8fef3116ad40 /include/sys | |
| parent | bc2d809387debb95d82f47185d446f328da4d147 (diff) | |
Kill znode->z_gen field
This field is a duplicate of the inode->i_generation, so just
kill it.
Signed-off-by: Nikolay Borisov <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4538
Closes #4654
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/trace_acl.h | 10 | ||||
| -rw-r--r-- | include/sys/zfs_znode.h | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h index 230894229..f1d8eb78c 100644 --- a/include/sys/trace_acl.h +++ b/include/sys/trace_acl.h @@ -54,7 +54,6 @@ 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,7 +90,6 @@ 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,17 +119,15 @@ 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 gen %llu size %llu " - "links %llu pflags %llu uid %llu gid %llu " - "sync_cnt %u mode 0x%x is_sa %d " + "mapcnt %llu size %llu links %llu pflags %llu " + "uid %llu gid %llu sync_cnt %u mode 0x%x is_sa %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_gen, - __entry->z_size, + __entry->z_seq, __entry->z_mapcnt, __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_mapped, diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h index 30a6ec9f8..43b591915 100644 --- a/include/sys/zfs_znode.h +++ b/include/sys/zfs_znode.h @@ -196,7 +196,6 @@ typedef struct znode { uint_t z_blksz; /* block size in bytes */ uint_t z_seq; /* modification sequence number */ uint64_t z_mapcnt; /* number of pages mapped to file */ - uint64_t z_gen; /* generation (cached) */ uint64_t z_size; /* file size (cached) */ uint64_t z_links; /* file links (cached) */ uint64_t z_pflags; /* pflags (cached) */ |