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

Merge commit 'refs/top-bases/fix-branch' into fix-branch

This commit is contained in:
Brian Behlendorf 2010-08-02 14:06:33 -07:00
parent da40cc1454 425b8742a5
commit 64df38a167
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
module/zfs/zio.c
View File

@ -2632,11 +2632,6 @@ zio_ready(zio_t *zio)
static int static int
zio_done(zio_t *zio) zio_done(zio_t *zio)
{ {
spa_t *spa = zio->io_spa;
zio_t *lio = zio->io_logical;
blkptr_t *bp = zio->io_bp;
vdev_t *vd = zio->io_vd;
uint64_t psize = zio->io_size;
zio_t *pio, *pio_next; zio_t *pio, *pio_next;
/* /*
@ -2653,18 +2648,18 @@ zio_done(zio_t *zio)
for (int w = 0; w < ZIO_WAIT_TYPES; w++) for (int w = 0; w < ZIO_WAIT_TYPES; w++)
ASSERT(zio->io_children[c][w] == 0); ASSERT(zio->io_children[c][w] == 0);
if (bp != NULL) { if (zio->io_bp != NULL) {
ASSERT(bp->blk_pad[0] == 0); ASSERT(zio->io_bp->blk_pad[0] == 0);
ASSERT(bp->blk_pad[1] == 0); ASSERT(zio->io_bp->blk_pad[1] == 0);
ASSERT(bcmp(bp, &zio->io_bp_copy, sizeof (blkptr_t)) == 0 || ASSERT(bcmp(zio->io_bp, &zio->io_bp_copy, sizeof (blkptr_t)) == 0 ||
(bp == zio_unique_parent(zio)->io_bp)); (zio->io_bp == zio_unique_parent(zio)->io_bp));
if (zio->io_type == ZIO_TYPE_WRITE && !BP_IS_HOLE(bp) && if (zio->io_type == ZIO_TYPE_WRITE && !BP_IS_HOLE(zio->io_bp) &&
zio->io_bp_override == NULL && zio->io_bp_override == NULL &&
!(zio->io_flags & ZIO_FLAG_IO_REPAIR)) { !(zio->io_flags & ZIO_FLAG_IO_REPAIR)) {
ASSERT(!BP_SHOULD_BYTESWAP(bp)); ASSERT(!BP_SHOULD_BYTESWAP(zio->io_bp));
ASSERT3U(zio->io_prop.zp_copies, <=, BP_GET_NDVAS(bp)); ASSERT3U(zio->io_prop.zp_copies, <=, BP_GET_NDVAS(zio->io_bp));
ASSERT(BP_COUNT_GANG(bp) == 0 || ASSERT(BP_COUNT_GANG(zio->io_bp) == 0 ||
(BP_COUNT_GANG(bp) == BP_GET_NDVAS(bp))); (BP_COUNT_GANG(zio->io_bp) == BP_GET_NDVAS(zio->io_bp)));
} }
} }
@ -2683,13 +2678,13 @@ zio_done(zio_t *zio)
while (zio->io_cksum_report != NULL) { while (zio->io_cksum_report != NULL) {
zio_cksum_report_t *zcr = zio->io_cksum_report; zio_cksum_report_t *zcr = zio->io_cksum_report;
uint64_t align = zcr->zcr_align; uint64_t align = zcr->zcr_align;
uint64_t asize = P2ROUNDUP(psize, align); uint64_t asize = P2ROUNDUP(zio->io_size, align);
char *abuf = zio->io_data; char *abuf = zio->io_data;
if (asize != psize) { if (asize != zio->io_size) {
abuf = zio_buf_alloc(asize); abuf = zio_buf_alloc(asize);
bcopy(zio->io_data, abuf, psize); bcopy(zio->io_data, abuf, zio->io_size);
bzero(abuf + psize, asize - psize); bzero(abuf + zio->io_size, asize - zio->io_size);
} }
zio->io_cksum_report = zcr->zcr_next; zio->io_cksum_report = zcr->zcr_next;
@ -2697,14 +2692,14 @@ zio_done(zio_t *zio)
zcr->zcr_finish(zcr, abuf); zcr->zcr_finish(zcr, abuf);
zfs_ereport_free_checksum(zcr); zfs_ereport_free_checksum(zcr);
if (asize != psize) if (asize != zio->io_size)
zio_buf_free(abuf, asize); zio_buf_free(abuf, asize);
} }
} }
zio_pop_transforms(zio); /* note: may set zio->io_error */ zio_pop_transforms(zio); /* note: may set zio->io_error */
vdev_stat_update(zio, psize); vdev_stat_update(zio, zio->io_size);
if (zio->io_error) { if (zio->io_error) {
/* /*
@ -2713,28 +2708,30 @@ zio_done(zio_t *zio)
* at the block level. We ignore these errors if the * at the block level. We ignore these errors if the
* device is currently unavailable. * device is currently unavailable.
*/ */
if (zio->io_error != ECKSUM && vd != NULL && !vdev_is_dead(vd)) if (zio->io_error != ECKSUM && zio->io_vd != NULL &&
zfs_ereport_post(FM_EREPORT_ZFS_IO, spa, vd, zio, 0, 0); !vdev_is_dead(zio->io_vd))
zfs_ereport_post(FM_EREPORT_ZFS_IO, zio->io_spa,
zio->io_vd, zio, 0, 0);
if ((zio->io_error == EIO || !(zio->io_flags & if ((zio->io_error == EIO || !(zio->io_flags &
(ZIO_FLAG_SPECULATIVE | ZIO_FLAG_DONT_PROPAGATE))) && (ZIO_FLAG_SPECULATIVE | ZIO_FLAG_DONT_PROPAGATE))) &&
zio == lio) { zio == zio->io_logical) {
/* /*
* For logical I/O requests, tell the SPA to log the * For logical I/O requests, tell the SPA to log the
* error and generate a logical data ereport. * error and generate a logical data ereport.
*/ */
spa_log_error(spa, zio); spa_log_error(zio->io_spa, zio);
zfs_ereport_post(FM_EREPORT_ZFS_DATA, spa, NULL, zio, zfs_ereport_post(FM_EREPORT_ZFS_DATA, zio->io_spa, NULL, zio,
0, 0); 0, 0);
} }
} }
if (zio->io_error && zio == lio) { if (zio->io_error && zio == zio->io_logical) {
/* /*
* Determine whether zio should be reexecuted. This will * Determine whether zio should be reexecuted. This will
* propagate all the way to the root via zio_notify_parent(). * propagate all the way to the root via zio_notify_parent().
*/ */
ASSERT(vd == NULL && bp != NULL); ASSERT(zio->io_vd == NULL && zio->io_bp != NULL);
ASSERT(zio->io_child_type == ZIO_CHILD_LOGICAL); ASSERT(zio->io_child_type == ZIO_CHILD_LOGICAL);
if (IO_IS_ALLOCATING(zio) && if (IO_IS_ALLOCATING(zio) &&
@ -2748,8 +2745,8 @@ zio_done(zio_t *zio)
if ((zio->io_type == ZIO_TYPE_READ || if ((zio->io_type == ZIO_TYPE_READ ||
zio->io_type == ZIO_TYPE_FREE) && zio->io_type == ZIO_TYPE_FREE) &&
zio->io_error == ENXIO && zio->io_error == ENXIO &&
spa_load_state(spa) == SPA_LOAD_NONE && spa_load_state(zio->io_spa) == SPA_LOAD_NONE &&
spa_get_failmode(spa) != ZIO_FAILURE_MODE_CONTINUE) spa_get_failmode(zio->io_spa) != ZIO_FAILURE_MODE_CONTINUE)
zio->io_reexecute |= ZIO_REEXECUTE_SUSPEND; zio->io_reexecute |= ZIO_REEXECUTE_SUSPEND;
if (!(zio->io_flags & ZIO_FLAG_CANFAIL) && !zio->io_reexecute) if (!(zio->io_flags & ZIO_FLAG_CANFAIL) && !zio->io_reexecute)
@ -2775,7 +2772,7 @@ zio_done(zio_t *zio)
if ((zio->io_error || zio->io_reexecute) && if ((zio->io_error || zio->io_reexecute) &&
IO_IS_ALLOCATING(zio) && zio->io_gang_leader == zio && IO_IS_ALLOCATING(zio) && zio->io_gang_leader == zio &&
!(zio->io_flags & ZIO_FLAG_IO_REWRITE)) !(zio->io_flags & ZIO_FLAG_IO_REWRITE))
zio_dva_unallocate(zio, zio->io_gang_tree, bp); zio_dva_unallocate(zio, zio->io_gang_tree, zio->io_bp);
zio_gang_tree_free(&zio->io_gang_tree); zio_gang_tree_free(&zio->io_gang_tree);
@ -2840,14 +2837,14 @@ zio_done(zio_t *zio)
* We'd fail again if we reexecuted now, so suspend * We'd fail again if we reexecuted now, so suspend
* until conditions improve (e.g. device comes online). * until conditions improve (e.g. device comes online).
*/ */
zio_suspend(spa, zio); zio_suspend(zio->io_spa, zio);
} else { } else {
/* /*
* Reexecution is potentially a huge amount of work. * Reexecution is potentially a huge amount of work.
* Hand it off to the otherwise-unused claim taskq. * Hand it off to the otherwise-unused claim taskq.
*/ */
(void) taskq_dispatch( (void) taskq_dispatch(
spa->spa_zio_taskq[ZIO_TYPE_CLAIM][ZIO_TASKQ_ISSUE], zio->io_spa->spa_zio_taskq[ZIO_TYPE_CLAIM][ZIO_TASKQ_ISSUE],
(task_func_t *)zio_reexecute, zio, TQ_SLEEP); (task_func_t *)zio_reexecute, zio, TQ_SLEEP);
} }
return (ZIO_PIPELINE_STOP); return (ZIO_PIPELINE_STOP);