Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1484819

[PATCH 15/21] blk-mq: Pair blk_mq_hctx_kobj_init() with blk_mq_hctx_kobj_put()

Show all headers | View raw

CC: Jens Axboe <axboe@kernel.dk>
CC: linux-nvme@lists.infradead.org
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
 block/blk-mq-sysfs.c | 5 +++++
 block/blk-mq.c       | 2 +-
 block/blk-mq.h       | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index fe822aa..404ccd5 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -417,6 +417,11 @@ void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx)
 	kobject_init(&hctx->kobj, &blk_mq_hw_ktype);
 }
 
+void blk_mq_hctx_kobj_put(struct blk_mq_hw_ctx *hctx)
+{
+	kobject_put(&hctx->kobj);
+}
+
 static void blk_mq_sysfs_init(struct request_queue *q)
 {
 	struct blk_mq_ctx *ctx;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 9e5cd1f..e14f7e8 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2009,7 +2009,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
 		if (!hctx)
 			continue;
 
-		kobject_put(&hctx->kobj);
+		blk_mq_hctx_kobj_put(hctx);
 
 		if (hctx->tags) {
 			blk_mq_free_rq_map(set, hctx->tags, j);
diff --git a/block/blk-mq.h b/block/blk-mq.h
index 97b0051..592e308 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -57,6 +57,7 @@ extern int blk_mq_hw_queue_to_node(unsigned int *map, unsigned int);
 extern int blk_mq_sysfs_register(struct request_queue *q);
 extern void blk_mq_sysfs_unregister(struct request_queue *q);
 extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
+extern void blk_mq_hctx_kobj_put(struct blk_mq_hw_ctx *hctx);
 
 extern void blk_mq_rq_timed_out(struct request *req, bool reserved);
 
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 13/21] blk-mq: Move hardware context init code into blk_mq_init_hctx() Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH RFC 19/21] blk-mq: Enable combined hardware queues Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 11/21] blk-mq: Move duplicating code to blk_mq_exit_hctx() Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 09/21] blk-mq: Cleanup a loop exit condition Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 08/21] blk-mq: Cleanup hardware context data node selection Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 21/21] null_blk: Do not limit # of hardware queues to # of CPUs Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH RFC 18/21] blk-mq: Enable tag numbers exceed hardware queue depth Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 14/21] blk-mq: Rework blk_mq_init_hctx() function Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 01/21] blk-mq: Fix memory leaks on a queue cleanup Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 15/21] blk-mq: Pair blk_mq_hctx_kobj_init() with blk_mq_hctx_kobj_put() Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 04/21] blk-mq: Do not limit number of queues to 'nr_cpu_ids' in allocations Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH 06/21] block: Remove redundant blk_mq_ops::map_queue() interface Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  [PATCH RFC 17/21] blk-mq: Introduce a 1:N hardware contexts Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 11:00 +0200
  Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Christoph Hellwig <hch@infradead.org> - 2016-09-16 11:30 +0200
    Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Alexander Gordeev <agordeev@redhat.com> - 2016-09-16 12:10 +0200
  Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Keith Busch <keith.busch@intel.com> - 2016-09-16 23:00 +0200
    Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Alexander Gordeev <agordeev@redhat.com> - 2016-09-19 12:40 +0200
      Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Bart Van Assche <Bart.VanAssche@sandisk.com> - 2016-09-19 15:50 +0200
      Re: [PATCH RFC 00/21] blk-mq: Introduce combined hardware queues Keith Busch <keith.busch@intel.com> - 2016-09-20 16:50 +0200

csiph-web