Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c43c83a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

direct-io: only use block polling if explicitly requested 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarStephen Bates <stephen.bates@pmcs.com>
Tested-by: default avatarStephen Bates <stephen.bates@pmcs.com>
Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 97be7ebe

fs/direct-io.c

+2 −1
Original line number Diff line number Diff line
@@ -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);