[PATCH] block: remove __blk_get_queue

[PATCH] block: remove __blk_get_queue

[Christoph Hellwig]

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 10 ++++------
 block/blk.h      |  5 -----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 123468b9d2e43..3d286a256d3d3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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;
-	}
-
-	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 c4b084bfe87c9..1d83b1d41cd10 100644
--- 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,
-- 
2.30.2

Re: [PATCH] block: remove __blk_get_queue

[Johannes Thumshirn]

Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Re: [PATCH] block: remove __blk_get_queue

[Chaitanya Kulkarni]

On 7/20/2022 11:34 PM, Christoph Hellwig wrote:
> __blk_get_queue is only called by blk_get_queue, so merge the two.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH] block: remove __blk_get_queue

[Jens Axboe]

On Thu, 21 Jul 2022 08:34:32 +0200, Christoph Hellwig wrote:
> __blk_get_queue is only called by blk_get_queue, so merge the two.
> 
> 

Applied, thanks!

[1/1] block: remove __blk_get_queue
      commit: 828b5f017d9d5d0491cd2e71d48f4f2139078e2c

Best regards,
-- 
Jens Axboe