Commit 828b5f01 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove __blk_get_queue 



__blk_get_queue is only called by blk_get_queue, so merge the two.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220721063432.1714609-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c5db2cfc

block/blk-core.c

+4 −6
Original line number Diff line number Diff line
@@ -461,12 +461,10 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu) 
 */

bool blk_get_queue(struct request_queue *q)

{

	if (likely(!blk_queue_dying(q))) {

		__blk_get_queue(q);

		return true;

	}



	if (unlikely(blk_queue_dying(q)))

		return false;

	kobject_get(&q->kobj);

	return true;

}

EXPORT_SYMBOL(blk_get_queue);

block/blk.h

+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ extern struct kmem_cache *blk_requestq_srcu_cachep; 
extern struct kobj_type blk_queue_ktype;

extern struct ida blk_queue_ida;



static inline void __blk_get_queue(struct request_queue *q)

{

	kobject_get(&q->kobj);

}



bool is_flush_rq(struct request *req);



struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,