Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons

Conflicts:
	module/zfs/dnode.c

diff --cc module/zfs/dmu_zfetch.c
Simple merge

diff --cc module/zfs/dnode.c
index 6e4633a05f7e5b9d91842575e85b41bad470ac00,c16902d21697d2bc8a3f516cfce7651b6ff589cc..c74ba8ac36722821bdc96412db35d2fd5ac4b099
--- 1/module/zfs/dnode.c
--- 2/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
@@@ -334,13 -319,9 +359,16 @@@ dnode_create(objset_t *os, dnode_phys_
        dn->dn_bonustype = dnp->dn_bonustype;
        dn->dn_bonuslen = dnp->dn_bonuslen;
        dn->dn_maxblkid = dnp->dn_maxblkid;
 +      dn->dn_allocated_txg = 0;
 +      dn->dn_free_txg = 0;
 +      dn->dn_assigned_txg = 0;
 +      dn->dn_dirtyctx = DN_UNDIRTIED;
 +      dn->dn_dirtyctx_firstset = NULL;
 +      dn->dn_bonus = NULL;
 +      dn->dn_zio = NULL;
+       dn->dn_have_spill = ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) != 0);
+       dn->dn_id_flags = 0;
+ 
        dmu_zfetch_init(&dn->dn_zfetch, dn);
  
        ASSERT(dn->dn_phys->dn_type < DMU_OT_NUMTYPES);

diff --cc module/zfs/include/sys/dmu_zfetch.h
index 97b6738522165ed2840babf674289f0e13f19f64,78cadd2b1ee1b4603c91580cfa9a2a01ebdb04c5..ea73d8f02acb8a26b52fec9caa80b155d3847981
--- 1/module/zfs/include/sys/dmu_zfetch.h
--- 2/module/zfs/include/sys/dmu_zfetch.h
+++ b/module/zfs/include/sys/dmu_zfetch.h
@@@ -63,11 -61,11 +61,14 @@@ typedef struct zfetch 
        uint64_t        zf_alloc_fail;  /* # of failed attempts to alloc strm */
  } zfetch_t;
  
+ void          zfetch_init(void);
+ void          zfetch_fini(void);
+ 
  void          dmu_zfetch_init(zfetch_t *, struct dnode *);
  void          dmu_zfetch_rele(zfetch_t *);
 +void          dmu_zfetch_cons(zfetch_t *);
 +void          dmu_zfetch_dest(zfetch_t *);
 +
  void          dmu_zfetch(zfetch_t *, uint64_t, uint64_t, int);
  
  

diff --cc module/zfs/include/sys/dnode.h
Simple merge