diff options
| author | Damien Le Moal <damien.lemoal@wdc.com> | 2018-11-20 10:52:34 +0900 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-19 19:03:44 -0700 |
| commit | e2b3fa5af70c1e646270f6c7c799414f5e904d7a (patch) | |
| tree | c4a2a5236528e6b4efe8537328e1d9647b84795d /block/blk.h | |
| parent | 23464f8c3407b83106463999b64fe10dc66ff6a3 (diff) | |
| download | lwn-e2b3fa5af70c1e646270f6c7c799414f5e904d7a.tar.gz lwn-e2b3fa5af70c1e646270f6c7c799414f5e904d7a.zip | |
block: Remove bio->bi_ioc
bio->bi_ioc is never set so always NULL. Remove references to it in
bio_disassociate_task() and in rq_ioc() and delete this field from
struct bio. With this change, rq_ioc() always returns
current->io_context without the need for a bio argument. Further
simplify the code and make it more readable by also removing this
helper, which also allows to simplify blk_mq_sched_assign_ioc() by
removing its bio argument.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Adam Manzanares <adam.manzanares@wdc.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/block/blk.h b/block/blk.h index 816a9abb87cd..610948157a5b 100644 --- a/block/blk.h +++ b/block/blk.h @@ -255,22 +255,6 @@ 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 |