From 9bbf8f17619cac0d849345d3784c07c06fbcdeb1 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 19 Mar 2009 15:02:05 -0700 Subject: [PATCH] Resolve conflict with fix-dnode-cons --- module/zfs/arc.c | 3 --- module/zfs/dnode.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 6313a15f75..8a01c9ae53 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 bbb5a002ad..538a141b03 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;