diff --git a/block/blk-merge.c b/block/blk-merge.c index 1dced51de1c6ce24cc387a911269c144dfd961cf..2776ee6c5c3dcf468269c60199ed5c3ea78e682f 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -774,7 +774,7 @@ static struct request *attempt_merge(struct request_queue *q, req->__data_len += blk_rq_bytes(next); - if (req_op(req) != REQ_OP_DISCARD) + if (!blk_discard_mergable(req)) elv_merge_requests(q, req, next); /*