Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[karo-tx-linux.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index d6a9012d42ad570f231a1f48c6706c6af8d5a598..0a8d937c6775577d64c40cdaa250cc632619f339 100644 (file)
--- 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);