3752 want more verifiable dbuf user eviction
Submitted by:   Justin Gibbs <justing@spectralogic.com>
Submitted by:   Will Andrews <willa@spectralogic.com>

@@ -102,13 +102,13 @@
 
 void
 zap_leaf_byteswap(zap_leaf_phys_t *buf, int size)
 {
         int i;
-        zap_leaf_t l;
+        zap_leaf_t l = { 0 };
+
         l.l_bs = highbit(size)-1;
-        l.l_phys = buf;
 
         buf->l_hdr.lh_block_type =      BSWAP_64(buf->l_hdr.lh_block_type);
         buf->l_hdr.lh_prefix =          BSWAP_64(buf->l_hdr.lh_prefix);
         buf->l_hdr.lh_magic =           BSWAP_32(buf->l_hdr.lh_magic);
         buf->l_hdr.lh_nfree =           BSWAP_16(buf->l_hdr.lh_nfree);

@@ -830,11 +830,11 @@
 void
 zap_leaf_stats(zap_t *zap, zap_leaf_t *l, zap_stats_t *zs)
 {
         int i, n;
 
-        n = zap->zap_f.zap_phys->zap_ptrtbl.zt_shift -
+        n = zap->zap_f_phys->zap_ptrtbl.zt_shift -
             l->l_phys->l_hdr.lh_prefix_len;
         n = MIN(n, ZAP_HISTOGRAM_SIZE-1);
         zs->zs_leafs_with_2n_pointers[n]++;