diff options
| author | billm <none@none> | 2006-04-10 05:03:38 -0700 |
|---|---|---|
| committer | billm <none@none> | 2006-04-10 05:03:38 -0700 |
| commit | 44cd46cadd9aab751dae6a4023c1cb5bf316d274 (patch) | |
| tree | 27db23d9e2bc81a70d528c18cf9d04874891ed9d /usr/src/uts/common/fs/zfs/vdev_raidz.c | |
| parent | dc5d169b4bfc1a6993578ef34dae678076fd19fb (diff) | |
| download | illumos-gate-44cd46cadd9aab751dae6a4023c1cb5bf316d274.tar.gz | |
6410698 ZFS metadata needs to be more highly replicated (ditto blocks)
6410700 zdb should support reading raw blocks out of storage pool
6410709 ztest: spa config can change before pool export
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev_raidz.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev_raidz.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev_raidz.c b/usr/src/uts/common/fs/zfs/vdev_raidz.c index 6e69053b8a..33225de39b 100644 --- a/usr/src/uts/common/fs/zfs/vdev_raidz.c +++ b/usr/src/uts/common/fs/zfs/vdev_raidz.c @@ -272,12 +272,7 @@ vdev_raidz_io_start(zio_t *zio) rm = vdev_raidz_map_alloc(zio, tvd->vdev_ashift, vd->vdev_children); - if (DVA_GET_GANG(ZIO_GET_DVA(zio))) { - ASSERT3U(rm->rm_asize, ==, - vdev_psize_to_asize(vd, SPA_GANGBLOCKSIZE)); - } else { - ASSERT3U(rm->rm_asize, ==, DVA_GET_ASIZE(ZIO_GET_DVA(zio))); - } + ASSERT3U(rm->rm_asize, ==, vdev_psize_to_asize(vd, zio->io_size)); if (zio->io_type == ZIO_TYPE_WRITE) { @@ -357,11 +352,10 @@ vdev_raidz_io_done(zio_t *zio) vdev_t *cvd; raidz_map_t *rm = zio->io_vsd; raidz_col_t *rc; - blkptr_t *bp = zio->io_bp; int unexpected_errors = 0; int c; - ASSERT(bp != NULL); /* XXX need to add code to enforce this */ + ASSERT(zio->io_bp != NULL); /* XXX need to add code to enforce this */ zio->io_error = 0; zio->io_numerrors = 0; |