Commit 6cf7677f authored Feb 08, 2017 by Christoph Hellwig Committed by Jens Axboe Feb 08, 2017

block: move req_set_nomerge to blk.h



This makes it available outside of blk-merge.c, and inlining such a trivial
helper seems pretty useful to start with.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 80c6b157

block/blk-merge.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -482,13 +482,6 @@ int blk_rq_map_sg(struct request_queue q, struct request rq,
		}
		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,
		struct request *req,
		struct bio *bio)

block/blk.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,13 @@ static inline int blk_do_io_stat(struct request *rq)
		!blk_rq_is_passthrough(rq);
		}

		static inline 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;
		}

		/*
		* Internal io_context interface
		*/