]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/fix-list' into fix-list
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)
1  2 
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dbuf.h
module/zfs/vdev.c

Simple merge
Simple merge
Simple merge
Simple merge
index 23f466b720a8ae7b6e31684c294553ea8c3a333f,a61f29b8e78a6deb58690a813aeed9ccee715ad1..df6ce3779567c54106498666d942ab257410512c
@@@ -318,9 -316,8 +316,10 @@@ vdev_alloc_common(spa_t *spa, uint_t id
        vd->vdev_guid_sum = guid;
        vd->vdev_ops = ops;
        vd->vdev_state = VDEV_STATE_CLOSED;
+       vd->vdev_ishole = (ops == &vdev_hole_ops);
  
 +      list_link_init(&vd->vdev_config_dirty_node);
 +      list_link_init(&vd->vdev_state_dirty_node);
        mutex_init(&vd->vdev_dtl_lock, NULL, MUTEX_DEFAULT, NULL);
        mutex_init(&vd->vdev_stat_lock, NULL, MUTEX_DEFAULT, NULL);
        mutex_init(&vd->vdev_probe_lock, NULL, MUTEX_DEFAULT, NULL);