Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c23ecb42 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: move rq_ioc() to blk.h 



We want to use it outside of blk-core.c.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
parent c51ca6cf

block/blk-core.c

+0 −16
Original line number Diff line number Diff line
@@ -1039,22 +1039,6 @@ static bool blk_rq_should_init_elevator(struct bio *bio) 
	return true;

}



/**

 * 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

block/blk.h

+16 −0
Original line number Diff line number Diff line
@@ -263,6 +263,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