summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-merge.c7
-rw-r--r--block/blk.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index a373416dbc9a..c956d9e7aafd 100644
--- 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,
482} 482}
483EXPORT_SYMBOL(blk_rq_map_sg); 483EXPORT_SYMBOL(blk_rq_map_sg);
484 484
485static void req_set_nomerge(struct request_queue *q, struct request *req)
486{
487 req->cmd_flags |= REQ_NOMERGE;
488 if (req == q->last_merge)
489 q->last_merge = NULL;
490}
491
492static inline int ll_new_hw_segment(struct request_queue *q, 485static inline int ll_new_hw_segment(struct request_queue *q,
493 struct request *req, 486 struct request *req,
494 struct bio *bio) 487 struct bio *bio)
diff --git a/block/blk.h b/block/blk.h
index 4972b98d47e1..3e08703902a9 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -256,6 +256,13 @@ static inline int blk_do_io_stat(struct request *rq)
256 !blk_rq_is_passthrough(rq); 256 !blk_rq_is_passthrough(rq);
257} 257}
258 258
259static inline void req_set_nomerge(struct request_queue *q, struct request *req)
260{
261 req->cmd_flags |= REQ_NOMERGE;
262 if (req == q->last_merge)
263 q->last_merge = NULL;
264}
265
259/* 266/*
260 * Internal io_context interface 267 * Internal io_context interface
261 */ 268 */