diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
| commit | 9babb37438b58e77bad04e820d5702e15b79e6a6 (patch) | |
| tree | e369da81095eca3fc155b0c02bdd4a9f06506781 /module/zfs/zio_inject.c | |
| parent | d164b2093561a9771db07346e6fffc9ca19427a2 (diff) | |
Rebase master to b117
Diffstat (limited to 'module/zfs/zio_inject.c')
| -rw-r--r-- | module/zfs/zio_inject.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/module/zfs/zio_inject.c b/module/zfs/zio_inject.c index b3469fdd5..f8e6880c9 100644 --- a/module/zfs/zio_inject.c +++ b/module/zfs/zio_inject.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -195,7 +195,7 @@ zio_handle_label_injection(zio_t *zio, int error) int -zio_handle_device_injection(vdev_t *vd, int error) +zio_handle_device_injection(vdev_t *vd, zio_t *zio, int error) { inject_handler_t *handler; int ret = 0; @@ -210,6 +210,12 @@ zio_handle_device_injection(vdev_t *vd, int error) continue; if (vd->vdev_guid == handler->zi_record.zi_guid) { + if (handler->zi_record.zi_failfast && + (zio == NULL || (zio->io_flags & + (ZIO_FLAG_IO_RETRY | ZIO_FLAG_TRYHARD)))) { + continue; + } + if (handler->zi_record.zi_error == error) { /* * For a failed open, pretend like the device |