Merge "Revert "block: fix single range discard merge""

block/blk-merge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -786,7 +786,7 @@ static struct request attempt_merge(struct request_queue q,

		req->__data_len += blk_rq_bytes(next);

		if (!blk_discard_mergable(req))
		if (req_op(req) != REQ_OP_DISCARD)
		elv_merge_requests(q, req, next);

		/*