From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:48770 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932220AbeAKUO3 (ORCPT ); Thu, 11 Jan 2018 15:14:29 -0500 From: Mike Snitzer To: axboe@kernel.dk Cc: Ming Lei , hare@suse.de, Bart.VanAssche@wdc.com, dm-devel@redhat.com, linux-block@vger.kernel.org Subject: [for-4.16 PATCH v4 2/4] block: use queue_lock when clearing QUEUE_FLAG_REGISTERED in blk_unregister_queue Date: Thu, 11 Jan 2018 15:14:15 -0500 Message-Id: <20180111201417.2042-3-snitzer@redhat.com> In-Reply-To: <20180111201417.2042-1-snitzer@redhat.com> References: <20180111201417.2042-1-snitzer@redhat.com> Sender: linux-block-owner@vger.kernel.org List-Id: linux-block@vger.kernel.org blk_unregister_queue() must protect against any modifications of q->queue_flags (not just those performed in blk-sysfs.c). Therefore q->queue_lock needs to be used rather than q->sysfs_lock. Fixes: e9a823fb34a8b ("block: fix warning when I/O elevator is changed as request_queue is being removed") Cc: stable@vger.kernel.org # 4.14+ Reported-by: Bart Van Assche Signed-off-by: Mike Snitzer --- block/blk-sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 870484eaed1f..52f57539f1c7 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -929,9 +929,9 @@ void blk_unregister_queue(struct gendisk *disk) if (WARN_ON(!q)) return; - mutex_lock(&q->sysfs_lock); + spin_lock_irq(q->queue_lock); queue_flag_clear_unlocked(QUEUE_FLAG_REGISTERED, q); - mutex_unlock(&q->sysfs_lock); + spin_unlock_irq(q->queue_lock); wbt_exit(q); -- 2.15.0