diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-03-04 18:55:56 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-03-07 12:45:57 -0700 |
| commit | c75e707fe1aab32f1dc8e09845533b6542d9aaa9 (patch) | |
| tree | 9677a5c6208862bfa95b0b5b9d7a635b0d3b3e2f /block/blk-merge.c | |
| parent | nvme: remove support or stream based temperature hint (diff) | |
| download | wireguard-linux-c75e707fe1aab32f1dc8e09845533b6542d9aaa9.tar.xz wireguard-linux-c75e707fe1aab32f1dc8e09845533b6542d9aaa9.zip | |
block: remove the per-bio/request write hint
With the NVMe support for this gone, there are no consumers of these hints
left, so remove them.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220304175556.407719-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index f5255991b773..0e871d4e7cb8 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -782,13 +782,6 @@ static struct request *attempt_merge(struct request_queue *q, !blk_write_same_mergeable(req->bio, next->bio)) return NULL; - /* - * Don't allow merge of different write hints, or for a hint with - * non-hint IO. - */ - if (req->write_hint != next->write_hint) - return NULL; - if (req->ioprio != next->ioprio) return NULL; @@ -915,13 +908,6 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) !blk_write_same_mergeable(rq->bio, bio)) return false; - /* - * Don't allow merge of different write hints, or for a hint with - * non-hint IO. - */ - if (rq->write_hint != bio->bi_write_hint) - return false; - if (rq->ioprio != bio_prio(bio)) return false; |