Re: [PATCH 5/7] direct-io: only use block polling if explicitly requested

[Jeff Moyer <jmoyer-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> writes:

> Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>

Reviewed-by: Jeff Moyer <jmoyer-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

> ---
>  fs/direct-io.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index d6a9012..0a8d937 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -445,7 +445,8 @@ static struct bio *dio_await_one(struct dio *dio)
>  		__set_current_state(TASK_UNINTERRUPTIBLE);
>  		dio->waiter = current;
>  		spin_unlock_irqrestore(&dio->bio_lock, flags);
> -		if (!blk_poll(bdev_get_queue(dio->bio_bdev), dio->bio_cookie))
> +		if (!(dio->iocb->ki_flags & IOCB_HIPRI) ||
> +		    !blk_poll(bdev_get_queue(dio->bio_bdev), dio->bio_cookie))
>  			io_schedule();
>  		/* wake up sets us TASK_RUNNING */
>  		spin_lock_irqsave(&dio->bio_lock, flags);