diff options
author | Brian Behlendorf <[email protected]> | 2009-01-13 15:34:01 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2009-01-13 15:34:01 -0800 |
commit | 32baeb1712a8600343140b00d4c2fa1ccf1262ba (patch) | |
tree | a795388d433e4b90ed4c0d84ffa48e37e5baa891 /module | |
parent | b14513e826bd017af55e822d745ad5f139800531 (diff) | |
parent | 0d6b81fcca82d41141e1b47f0b6940896e3c7ef2 (diff) |
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Diffstat (limited to 'module')
-rw-r--r-- | module/zfs/arc.c | 3 | ||||
-rw-r--r-- | module/zfs/dbuf.c | 1 | ||||
-rw-r--r-- | module/zfs/dsl_dataset.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 392bf417c..f13b65e5b 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -755,6 +755,8 @@ 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); + list_link_init(&buf->b_arc_node); + list_link_init(&buf->b_l2node); ARCSTAT_INCR(arcstat_hdr_size, HDR_SIZE); return (0); @@ -4354,6 +4356,7 @@ l2arc_add_vdev(spa_t *spa, vdev_t *vd, uint64_t start, uint64_t end) adddev->l2ad_hand = adddev->l2ad_start; adddev->l2ad_evict = adddev->l2ad_start; adddev->l2ad_first = B_TRUE; + list_link_init(&adddev->l2ad_node); ASSERT3U(adddev->l2ad_write, >, 0); /* diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index d7ff083b4..1fd66d964 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -58,6 +58,7 @@ dbuf_cons(void *vdb, void *unused, int kmflag) mutex_init(&db->db_mtx, NULL, MUTEX_DEFAULT, NULL); cv_init(&db->db_changed, NULL, CV_DEFAULT, NULL); refcount_create(&db->db_holds); + list_link_init(&db->db_link); return (0); } diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index db123a542..ad9b717a6 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -359,6 +359,7 @@ dsl_dataset_get_ref(dsl_pool_t *dp, uint64_t dsobj, void *tag, ds->ds_dbuf = dbuf; ds->ds_object = dsobj; ds->ds_phys = dbuf->db_data; + list_link_init(&ds->ds_synced_link); mutex_init(&ds->ds_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&ds->ds_opening_lock, NULL, MUTEX_DEFAULT, NULL); |