Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34fe7c05 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: enumify ELEVATOR_*_MERGE 



Switch these constants to an enum, and make let the compiler ensure that
all callers of blk_try_merge and elv_merge handle all potential values.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6cf7677f

block/blk-core.c

+40 −36
Original line number Diff line number Diff line
@@ -1511,12 +1511,11 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 
{

	struct blk_plug *plug;

	struct request *rq;

	bool ret = false;

	struct list_head *plug_list;



	plug = current->plug;

	if (!plug)

		goto out;

		return false;

	*request_count = 0;



	if (q->mq_ops)
@@ -1525,7 +1524,7 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 
		plug_list = &plug->list;



	list_for_each_entry_reverse(rq, plug_list, queuelist) {

		int el_ret;

		bool merged = false;



		if (rq->q == q) {

			(*request_count)++;
@@ -1541,19 +1540,22 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 
		if (rq->q != q || !blk_rq_merge_ok(rq, bio))

			continue;



		el_ret = blk_try_merge(rq, bio);

		if (el_ret == ELEVATOR_BACK_MERGE) {

			ret = bio_attempt_back_merge(q, rq, bio);

			if (ret)

		switch (blk_try_merge(rq, bio)) {

		case ELEVATOR_BACK_MERGE:

			merged = bio_attempt_back_merge(q, rq, bio);

			break;

		} else if (el_ret == ELEVATOR_FRONT_MERGE) {

			ret = bio_attempt_front_merge(q, rq, bio);

			if (ret)

		case ELEVATOR_FRONT_MERGE:

			merged = bio_attempt_front_merge(q, rq, bio);

			break;

		default:

			break;

		}



		if (merged)

			return true;

	}

out:

	return ret;



	return false;

}



unsigned int blk_plug_queued_count(struct request_queue *q)
@@ -1595,7 +1597,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) 
static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)

{

	struct blk_plug *plug;

	int el_ret, where = ELEVATOR_INSERT_SORT;

	int where = ELEVATOR_INSERT_SORT;

	struct request *req, *free;

	unsigned int request_count = 0;

	unsigned int wb_acct;
@@ -1633,27 +1635,29 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) 


	spin_lock_irq(q->queue_lock);



	el_ret = elv_merge(q, &req, bio);

	if (el_ret == ELEVATOR_BACK_MERGE) {

		if (bio_attempt_back_merge(q, req, bio)) {

	switch (elv_merge(q, &req, bio)) {

	case ELEVATOR_BACK_MERGE:

		if (!bio_attempt_back_merge(q, req, bio))

			break;

		elv_bio_merged(q, req, bio);

		free = attempt_back_merge(q, req);

			if (!free)

				elv_merged_request(q, req, el_ret);

			else

		if (free)

			__blk_put_request(q, free);

		else

			elv_merged_request(q, req, ELEVATOR_BACK_MERGE);

		goto out_unlock;

		}

	} else if (el_ret == ELEVATOR_FRONT_MERGE) {

		if (bio_attempt_front_merge(q, req, bio)) {

	case ELEVATOR_FRONT_MERGE:

		if (!bio_attempt_front_merge(q, req, bio))

			break;

		elv_bio_merged(q, req, bio);

		free = attempt_front_merge(q, req);

			if (!free)

				elv_merged_request(q, req, el_ret);

			else

		if (free)

			__blk_put_request(q, free);

		else

			elv_merged_request(q, req, ELEVATOR_FRONT_MERGE);

		goto out_unlock;

		}

	default:

		break;

	}



get_rq:

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
	return true;

}



int blk_try_merge(struct request *rq, struct bio *bio)

enum elv_merge blk_try_merge(struct request *rq, struct bio *bio)

{

	if (blk_rq_pos(rq) + blk_rq_sectors(rq) == bio->bi_iter.bi_sector)

		return ELEVATOR_BACK_MERGE;

block/blk-mq-sched.c

+17 −18
Original line number Diff line number Diff line
@@ -238,31 +238,30 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, 
			    struct request **merged_request)

{

	struct request *rq;

	int ret;



	ret = elv_merge(q, &rq, bio);

	if (ret == ELEVATOR_BACK_MERGE) {

	switch (elv_merge(q, &rq, bio)) {

	case ELEVATOR_BACK_MERGE:

		if (!blk_mq_sched_allow_merge(q, rq, bio))

			return false;

		if (bio_attempt_back_merge(q, rq, bio)) {

		if (!bio_attempt_back_merge(q, rq, bio))

			return false;

		*merged_request = attempt_back_merge(q, rq);

		if (!*merged_request)

				elv_merged_request(q, rq, ret);

			elv_merged_request(q, rq, ELEVATOR_BACK_MERGE);

		return true;

		}

	} else if (ret == ELEVATOR_FRONT_MERGE) {

	case ELEVATOR_FRONT_MERGE:

		if (!blk_mq_sched_allow_merge(q, rq, bio))

			return false;

		if (bio_attempt_front_merge(q, rq, bio)) {

		if (!bio_attempt_front_merge(q, rq, bio))

			return false;

		*merged_request = attempt_front_merge(q, rq);

		if (!*merged_request)

				elv_merged_request(q, rq, ret);

			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);

		return true;

		}

	}



	default:

		return false;

	}

}

EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge);



bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio)

block/blk-mq.c

+14 −18
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static bool blk_mq_attempt_merge(struct request_queue *q, 
	int checked = 8;



	list_for_each_entry_reverse(rq, &ctx->rq_list, queuelist) {

		int el_ret;

		bool merged = false;



		if (!checked--)

			break;
@@ -771,26 +771,22 @@ static bool blk_mq_attempt_merge(struct request_queue *q, 
		if (!blk_rq_merge_ok(rq, bio))

			continue;



		el_ret = blk_try_merge(rq, bio);

		if (el_ret == ELEVATOR_NO_MERGE)

			continue;



		if (!blk_mq_sched_allow_merge(q, rq, bio))

			break;



		if (el_ret == ELEVATOR_BACK_MERGE) {

			if (bio_attempt_back_merge(q, rq, bio)) {

				ctx->rq_merged++;

				return true;

			}

		switch (blk_try_merge(rq, bio)) {

		case ELEVATOR_BACK_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_back_merge(q, rq, bio);

			break;

		} else if (el_ret == ELEVATOR_FRONT_MERGE) {

			if (bio_attempt_front_merge(q, rq, bio)) {

				ctx->rq_merged++;

				return true;

			}

		case ELEVATOR_FRONT_MERGE:

			if (blk_mq_sched_allow_merge(q, rq, bio))

				merged = bio_attempt_front_merge(q, rq, bio);

			break;

		default:

			continue;

		}



		if (merged)

			ctx->rq_merged++;

		return merged;

	}



	return false;

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq, 
void blk_recalc_rq_segments(struct request *rq);

void blk_rq_set_mixed_merge(struct request *rq);

bool blk_rq_merge_ok(struct request *rq, struct bio *bio);

int blk_try_merge(struct request *rq, struct bio *bio);

enum elv_merge blk_try_merge(struct request *rq, struct bio *bio);



void blk_queue_congestion_threshold(struct request_queue *q);