block: remove __blk_get_queue

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220721063432.1714609-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 123468b9d2e43fda3fc4a9dacd413e234ece4bcc..3d286a256d3d3394b3aff12b23038b58352d242c 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -461,12 +461,10 @@ fail_q:
  */
 bool blk_get_queue(struct request_queue *q)
 {
-       if (likely(!blk_queue_dying(q))) {
-               __blk_get_queue(q);
-               return true;
-       }
-
-       return false;
+       if (unlikely(blk_queue_dying(q)))
+               return false;
+       kobject_get(&q->kobj);
+       return true;
 }
 EXPORT_SYMBOL(blk_get_queue);
 

diff --git a/block/blk.h b/block/blk.h
index c4b084bfe87c90045c3aa930db9da3c43180fa74..1d83b1d41cd101f6937ff22149cd6c8c7f02af4e 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -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,