diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-02-08 14:46:47 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-08 13:43:04 -0700 |
| commit | 6cf7677f1a94546e472658290b3b8bdbb16cc045 (patch) | |
| tree | eb86076357ae5e6546ff16ada7e3cfcf63c06b91 | |
| parent | 80c6b15732f0d8830032149cbcbc8d67e074b5e8 (diff) | |
| download | linux-stable-6cf7677f1a94546e472658290b3b8bdbb16cc045.tar.gz linux-stable-6cf7677f1a94546e472658290b3b8bdbb16cc045.tar.bz2 linux-stable-6cf7677f1a94546e472658290b3b8bdbb16cc045.zip | |
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>
| -rw-r--r-- | block/blk-merge.c | 7 | ||||
| -rw-r--r-- | block/blk.h | 7 |
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, } 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 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) !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 */ |