diff options
| author | Jens Axboe <axboe@fb.com> | 2016-12-14 22:23:43 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-17 18:03:42 +0100 |
| commit | c23ecb426084a98418ee29124c139e37c274ad04 (patch) | |
| tree | cc5a01c2a4af28ce0fbd539bb6194812f1cb1510 /block | |
| parent | block: move existing elevator ops to union (diff) | |
| download | linux-c23ecb426084a98418ee29124c139e37c274ad04.tar.xz linux-c23ecb426084a98418ee29124c139e37c274ad04.zip | |
block: move rq_ioc() to blk.h
We want to use it outside of blk-core.c.
Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 16 | ||||
| -rw-r--r-- | block/blk.h | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 61ba08c58b64..92baea07acbc 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1040,22 +1040,6 @@ static bool blk_rq_should_init_elevator(struct bio *bio) } /** - * rq_ioc - determine io_context for request allocation - * @bio: request being allocated is for this bio (can be %NULL) - * - * Determine io_context to use for request allocation for @bio. May return - * %NULL if %current->io_context doesn't exist. - */ -static struct io_context *rq_ioc(struct bio *bio) -{ -#ifdef CONFIG_BLK_CGROUP - if (bio && bio->bi_ioc) - return bio->bi_ioc; -#endif - return current->io_context; -} - -/** * __get_request - get a free request * @rl: request list to allocate from * @op: operation and flags diff --git a/block/blk.h b/block/blk.h index f46c0ac8ae3d..9a716b5925a4 100644 --- a/block/blk.h +++ b/block/blk.h @@ -264,6 +264,22 @@ void ioc_clear_queue(struct request_queue *q); int create_task_io_context(struct task_struct *task, gfp_t gfp_mask, int node); /** + * rq_ioc - determine io_context for request allocation + * @bio: request being allocated is for this bio (can be %NULL) + * + * Determine io_context to use for request allocation for @bio. May return + * %NULL if %current->io_context doesn't exist. + */ +static inline struct io_context *rq_ioc(struct bio *bio) +{ +#ifdef CONFIG_BLK_CGROUP + if (bio && bio->bi_ioc) + return bio->bi_ioc; +#endif + return current->io_context; +} + +/** * create_io_context - try to create task->io_context * @gfp_mask: allocation mask * @node: allocation node |