Resolve conflict with fix-dnode-cons

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 6313a15f75bab8f9a8369f3e90a27cc257e6f982..8a01c9ae533ea36870a40beb9ab1dd0c522a9c2a 100644 (file)
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -777,12 +777,9 @@ hdr_cons(void *vbuf, void *unused, int kmflag)
        refcount_create(&buf->b_refcnt);
        cv_init(&buf->b_cv, NULL, CV_DEFAULT, NULL);
        mutex_init(&buf->b_freeze_lock, NULL, MUTEX_DEFAULT, NULL);
-<<<<<<< HEAD:module/zfs/arc.c
        list_link_init(&buf->b_arc_node);
        list_link_init(&buf->b_l2node);
-=======
        arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS);
->>>>>>> refs/top-bases/fix-list:module/zfs/arc.c
 
        return (0);
 }

diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
index bbb5a002ad69be04d84e44be62c756c3d8cb50a7..538a141b035533255bdc150f21951a699adcf81d 100644 (file)
--- a/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
@@ -283,13 +283,6 @@ dnode_create(objset_impl_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db,
        dn->dn_dbuf = db;
        dn->dn_phys = dnp;
 
-       list_link_init(&dn->dn_link);
-       {
-               int i;
-               for (i = 0; i < TXG_SIZE; i++)
-                       list_link_init(&dn->dn_dirty_link[i]);
-       }
-
        if (dnp->dn_datablkszsec)
                dnode_setdblksz(dn, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
        dn->dn_indblkshift = dnp->dn_indblkshift;