]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/fix-list' into fix-list
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:07 +0000 (12:10 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:07 +0000 (12:10 -0700)
1  2 
module/zfs/dsl_dataset.c
module/zfs/vdev.c

index a227676f9307a1e33380cdf814ca078dd2f904fa,edc36e72babe2a0ba742eadef3e9f38a1afc09d3..63bfa094913d24e902791cec495655909dad822d
@@@ -357,9 -359,9 +359,10 @@@ dsl_dataset_get_ref(dsl_pool_t *dp, uin
                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_recvlock, NULL, MUTEX_DEFAULT, NULL);
                mutex_init(&ds->ds_opening_lock, NULL, MUTEX_DEFAULT, NULL);
                mutex_init(&ds->ds_deadlist.bpl_lock, NULL, MUTEX_DEFAULT,
                    NULL);
Simple merge