diff options
| author | Justin T. Gibbs <[email protected]> | 2015-04-02 02:14:34 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-04-28 16:25:20 -0700 |
| commit | d683ddbb7272a179da3918cc4f922d92a2195ba2 (patch) | |
| tree | 82e1d7a9e0a269de978e2d3d07fa785db63961f7 /include/sys/zap_leaf.h | |
| parent | 945dd93525d6e33f822beb44e3a3076c8bc89f86 (diff) | |
Illumos 5314 - Remove "dbuf phys" db->db_data pointer aliases in ZFS
5314 Remove "dbuf phys" db->db_data pointer aliases in ZFS
Author: Justin T. Gibbs <[email protected]>
Reviewed by: Andriy Gapon <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Will Andrews <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/5314
https://github.com/illumos/illumos-gate/commit/c137962
Ported-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys/zap_leaf.h')
| -rw-r--r-- | include/sys/zap_leaf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/sys/zap_leaf.h b/include/sys/zap_leaf.h index f6947a72d..d3749f368 100644 --- a/include/sys/zap_leaf.h +++ b/include/sys/zap_leaf.h @@ -83,7 +83,7 @@ struct zap_stats; */ #define ZAP_LEAF_CHUNK(l, idx) \ ((zap_leaf_chunk_t *) \ - ((l)->l_phys->l_hash + ZAP_LEAF_HASH_NUMENTRIES(l)))[idx] + (zap_leaf_phys(l)->l_hash + ZAP_LEAF_HASH_NUMENTRIES(l)))[idx] #define ZAP_LEAF_ENTRY(l, idx) (&ZAP_LEAF_CHUNK(l, idx).l_entry) typedef enum zap_chunk_type { @@ -156,9 +156,13 @@ typedef struct zap_leaf { uint64_t l_blkid; /* 1<<ZAP_BLOCK_SHIFT byte block off */ int l_bs; /* block size shift */ dmu_buf_t *l_dbuf; - zap_leaf_phys_t *l_phys; } zap_leaf_t; +static inline zap_leaf_phys_t * +zap_leaf_phys(zap_leaf_t *l) +{ + return (l->l_dbuf->db_data); +} typedef struct zap_entry_handle { /* Set by zap_leaf and public to ZAP */ |