From: Christoph Hellwig <hch@lst.de>
Date: Fri, 14 Dec 2018 16:21:22 +0000 (+0100)
Subject: block: clear REQ_HIPRI if polling is not supported
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d04c406f29d9f4dbcb5eb5aa79ce0445c7e9d652;p=openwrt%2Fstaging%2Fblogic.git

block: clear REQ_HIPRI if polling is not supported

This prevents a HIPRI bio from being submitted through a stacking
driver that does not support polling and thus won't poll for I/O
completion.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index fa661bac40af..c78042975737 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -921,6 +921,9 @@ generic_make_request_checks(struct bio *bio)
 		}
 	}
 
+	if (!test_bit(QUEUE_FLAG_POLL, &q->queue_flags))
+		bio->bi_opf &= ~REQ_HIPRI;
+
 	switch (bio_op(bio)) {
 	case REQ_OP_DISCARD:
 		if (!blk_queue_discard(q))