Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve conflict with fix-dnode-cons

This commit is contained in:
Brian Behlendorf 2009-03-19 15:02:05 -07:00
parent dbc3a5ec55
commit 9bbf8f1761
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/arc.c
View File

@ -777,12 +777,9 @@ hdr_cons(void *vbuf, void *unused, int kmflag)
refcount_create(&buf->b_refcnt); refcount_create(&buf->b_refcnt);
cv_init(&buf->b_cv, NULL, CV_DEFAULT, NULL); cv_init(&buf->b_cv, NULL, CV_DEFAULT, NULL);
mutex_init(&buf->b_freeze_lock, NULL, MUTEX_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_arc_node);
list_link_init(&buf->b_l2node); list_link_init(&buf->b_l2node);
=======
arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS); arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS);
>>>>>>> refs/top-bases/fix-list:module/zfs/arc.c
return (0); return (0);
} }

7
module/zfs/dnode.c
View File

@ -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_dbuf = db;
dn->dn_phys = dnp; 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) if (dnp->dn_datablkszsec)
dnode_setdblksz(dn, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT); dnode_setdblksz(dn, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
dn->dn_indblkshift = dnp->dn_indblkshift; dn->dn_indblkshift = dnp->dn_indblkshift;