X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzio.c;h=0bc19a7b79bf5aff0ef64fffd11cd80bfd6bdcb6;hb=8e07b99b2f5e1e281af72e07dee87301c8872f56;hp=2e1170920da3b7e56ad1a2c11daa756047d72390;hpb=29dee3ee9ac68d8a75c0d518b1342f447cd2ddc0;p=zfs.git diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 2e11709..0bc19a7 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1248,7 +1248,7 @@ zio_interrupt(zio_t *zio) * vdev-level caching or aggregation; (5) the I/O is deferred * due to vdev-level queueing; (6) the I/O is handed off to * another thread. In all cases, the pipeline stops whenever - * there's no CPU work; it never burns a thread in cv_wait(). + * there's no CPU work; it never burns a thread in cv_wait_io(). * * There's no locking on io_stage because there's no legitimate way * for multiple threads to be attempting to process the same I/O. @@ -2051,7 +2051,7 @@ zio_ddt_collision(zio_t *zio, ddt_t *ddt, ddt_entry_t *dde) ddt_exit(ddt); - error = arc_read_nolock(NULL, spa, &blk, + error = arc_read(NULL, spa, &blk, arc_getbuf_func, &abuf, ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE, &aflags, &zio->io_bookmark);