Merge "Revert "block: fix the DISCARD request merge"" (448aaf0e) · Commits · e / devices / android_kernel_oneplus_sm7250

block/blk-merge.c

+10 −36

Original line number	Diff line number	Diff line
		@@ -673,31 +673,6 @@ static void blk_account_io_merge(struct request *req)
		part_stat_unlock();
		}
		}
		/*
		* Two cases of handling DISCARD merge:
		* If max_discard_segments > 1, the driver takes every bio
		* as a range and send them to controller together. The ranges
		* needn't to be contiguous.
		* Otherwise, the bios/requests will be handled as same as
		* others which should be contiguous.
		*/
		static inline bool blk_discard_mergable(struct request *req)
		{
		if (req_op(req) == REQ_OP_DISCARD &&
		queue_max_discard_segments(req->q) > 1)
		return true;
		return false;
		}

		enum elv_merge blk_try_req_merge(struct request req, struct request next)
		{
		if (blk_discard_mergable(req))
		return ELEVATOR_DISCARD_MERGE;
		else if (blk_rq_pos(req) + blk_rq_sectors(req) == blk_rq_pos(next))
		return ELEVATOR_BACK_MERGE;

		return ELEVATOR_NO_MERGE;
		}

		static bool crypto_not_mergeable(const struct bio bio, const struct bio nxt)
		{
		@@ -720,6 +695,12 @@ static struct request attempt_merge(struct request_queue q,
		if (req_op(req) != req_op(next))
		return NULL;

		/*
		* not contiguous
		*/
		if (blk_rq_pos(req) + blk_rq_sectors(req) != blk_rq_pos(next))
		return NULL;

		if (rq_data_dir(req) != rq_data_dir(next)
		\|\| req->rq_disk != next->rq_disk
		\|\| req_no_special_merge(next))
		@@ -746,19 +727,11 @@ static struct request attempt_merge(struct request_queue q,
		* counts here. Handle DISCARDs separately, as they
		* have separate settings.
		*/

		switch (blk_try_req_merge(req, next)) {
		case ELEVATOR_DISCARD_MERGE:
		if (req_op(req) == REQ_OP_DISCARD) {
		if (!req_attempt_discard_merge(q, req, next))
		return NULL;
		break;
		case ELEVATOR_BACK_MERGE:
		if (!ll_merge_requests_fn(q, req, next))
		} else if (!ll_merge_requests_fn(q, req, next))
		return NULL;
		break;
		default:
		return NULL;
		}

		/*
		* If failfast settings disagree or any of the two is already
		@@ -882,7 +855,8 @@ bool blk_rq_merge_ok(struct request rq, struct bio bio)

		enum elv_merge blk_try_merge(struct request rq, struct bio bio)
		{
		if (blk_discard_mergable(rq))
		if (req_op(rq) == REQ_OP_DISCARD &&
		queue_max_discard_segments(rq->q) > 1)
		return ELEVATOR_DISCARD_MERGE;
		else if (blk_rq_pos(rq) + blk_rq_sectors(rq) ==
		bio->bi_iter.bi_sector) {