From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 19 Mar 2009 22:02:05 +0000 (-0700)
Subject: Resolve conflict with fix-dnode-cons
X-Git-Tag: zfs-0.4.4~12^2~16^2^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bbf8f17619cac0d849345d3784c07c06fbcdeb1;p=zfs

Resolve conflict with fix-dnode-cons
---

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 6313a15f7..8a01c9ae5 100644
--- 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 bbb5a002a..538a141b0 100644
--- 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;