block: move req_set_nomerge to blk.h

[mirror_ubuntu-bionic-kernel.git] / block / blk-merge.c

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)