From: Christoph Hellwig <hch@lst.de>
Date: Sat, 21 May 2022 07:44:06 +0000 (+0200)
Subject: block: remove __blk_get_queue
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73ee42b7ab2ab5b0965145773bc1acba14b35cfc;p=users%2Fhch%2Fblock.git

block: remove __blk_get_queue

Fold __blk_get_queue into its only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index 409719b85209..9f069c5a4688 100644
--- 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 4b2e0bc5b4a8..8c0842a38dd3 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,