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>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index a373416dbc9a9282cd0a5b7e364bb4e340b79489..c956d9e7aafdbb2da49a7c340ca062f975bca69a 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -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)

diff --git a/block/blk.h b/block/blk.h
index 4972b98d47e1ad4fb3cefe0a6c5ff8918381e22b..3e08703902a984e80341986052b68439d4b03700 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -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
  */