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

Commit e0c72300 authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Jens Axboe
Browse files

block: factor out req_set_nomerge 



Factor out common code for setting REQ_NOMERGE flag which is being used
out at certain places and make it a helper instead, req_set_nomerge().

Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>

Get rid of the inline.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent af309226

block/blk-merge.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -501,6 +501,13 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, 
}

}

EXPORT_SYMBOL(blk_rq_map_sg);

EXPORT_SYMBOL(blk_rq_map_sg);





static void req_set_nomerge(struct request_queue *q, struct request *req)

{

	req->cmd_flags |= REQ_NOMERGE;

	if (req == q->last_merge)

		q->last_merge = NULL;

}



static inline int ll_new_hw_segment(struct request_queue *q,

static inline int ll_new_hw_segment(struct request_queue *q,

				    struct request *req,

				    struct request *req,

				    struct bio *bio)

				    struct bio *bio)
@@ -521,9 +528,7 @@ static inline int ll_new_hw_segment(struct request_queue *q, 
	return 1;

	return 1;





no_merge:

no_merge:

	req->cmd_flags |= REQ_NOMERGE;

	req_set_nomerge(q, req);

	if (req == q->last_merge)

		q->last_merge = NULL;

	return 0;

	return 0;

}

}
@@ -537,9 +542,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, 
		return 0;

		return 0;

	if (blk_rq_sectors(req) + bio_sectors(bio) >

	if (blk_rq_sectors(req) + bio_sectors(bio) >

	    blk_rq_get_max_sectors(req, blk_rq_pos(req))) {

	    blk_rq_get_max_sectors(req, blk_rq_pos(req))) {

		req->cmd_flags |= REQ_NOMERGE;

		req_set_nomerge(q, req);

		if (req == q->last_merge)

			q->last_merge = NULL;

		return 0;

		return 0;

	}

	}

	if (!bio_flagged(req->biotail, BIO_SEG_VALID))

	if (!bio_flagged(req->biotail, BIO_SEG_VALID))
@@ -561,9 +564,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req, 
		return 0;

		return 0;

	if (blk_rq_sectors(req) + bio_sectors(bio) >

	if (blk_rq_sectors(req) + bio_sectors(bio) >

	    blk_rq_get_max_sectors(req, bio->bi_iter.bi_sector)) {

	    blk_rq_get_max_sectors(req, bio->bi_iter.bi_sector)) {

		req->cmd_flags |= REQ_NOMERGE;

		req_set_nomerge(q, req);

		if (req == q->last_merge)

			q->last_merge = NULL;

		return 0;

		return 0;

	}

	}

	if (!bio_flagged(bio, BIO_SEG_VALID))

	if (!bio_flagged(bio, BIO_SEG_VALID))