From: Ming Lei <ming.lei@redhat.com>
Date: Tue, 11 Jan 2022 12:34:01 +0000 (+0800)
Subject: block: cleanup q->srcu
X-Git-Tag: v6.1-rc5~2157^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=850fd2abbe02eb2b52cbb1550adbcc89b36d65de;p=platform%2Fkernel%2Flinux-starfive.git

block: cleanup q->srcu

srcu structure has to be cleanup via cleanup_srcu_struct(), so fix it.

Reported-by: syzbot+4f789823c1abc5accf13@syzkaller.appspotmail.com
Fixes: 704b914f15fb ("blk-mq: move srcu from blk_mq_hw_ctx to request_queue")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220111123401.520192-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index bed4a2f..9f32882 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -811,6 +811,9 @@ static void blk_release_queue(struct kobject *kobj)
 
 	bioset_exit(&q->bio_split);
 
+	if (blk_queue_has_srcu(q))
+		cleanup_srcu_struct(q->srcu);
+
 	ida_simple_remove(&blk_queue_ida, q->id);
 	call_rcu(&q->rcu_head, blk_free_queue_rcu);
 }