Merge tag 'v4.20-rc5' into for-4.21/block

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

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 6be04ef8da5b758d051c74f3698ab6f7e9ff6d14..4431da69a5cfced655f22d2892a97443da534c28 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -802,7 +802,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);
 
        /*