block: fix single range discard merge

[mirror_ubuntu-bionic-kernel.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index f9cb5f1984b59ee22b56209895c5e85fca5d72e9..5a0cc8550fe6e6b74933c7598cb8d9f3fd8f8587 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -766,7 +766,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);
 
        /*