From 72938d6905d9dcd60f7a5ff68ae469e74c248228 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Fri, 21 Dec 2012 10:40:20 +0800 Subject: [PATCH] Use cv_wait_io() which will will account for iowait Update zio_wait() to use cv_wait_io() to ensure the iowait time is properly accounted for. Signed-off-by: Brian Behlendorf --- include/sys/zfs_context.h | 1 + module/zfs/zio.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index ad282c43c4..6b00a5d5db 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -322,6 +322,7 @@ extern void cv_signal(kcondvar_t *cv); extern void cv_broadcast(kcondvar_t *cv); #define cv_timedwait_interruptible(cv, mp, at) cv_timedwait(cv, mp, at) #define cv_wait_interruptible(cv, mp) cv_wait(cv, mp) +#define cv_wait_io(cv, mp) cv_wait(cv, mp) /* * kstat creation, installation and deletion diff --git a/module/zfs/zio.c b/module/zfs/zio.c index ece3329d06..bfb817b786 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1316,7 +1316,7 @@ zio_wait(zio_t *zio) mutex_enter(&zio->io_lock); while (zio->io_executor != NULL) - cv_wait(&zio->io_cv, &zio->io_lock); + cv_wait_io(&zio->io_cv, &zio->io_lock); mutex_exit(&zio->io_lock); error = zio->io_error;