Commit 1233751f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

usb-storage: fix queue freeze vs limits lock order 



Match the locking order used by the core block code by only freezing
the queue after taking the limits lock using the
queue_limits_commit_update_frozen helper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarNilay Shroff <nilay@linux.ibm.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20250110054726.1499538-10-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f3dec61d

drivers/usb/storage/scsiglue.c

+1 −4
Original line number Diff line number Diff line
@@ -592,12 +592,9 @@ static ssize_t max_sectors_store(struct device *dev, struct device_attribute *at 
	if (sscanf(buf, "%hu", &ms) <= 0)

		return -EINVAL;



	blk_mq_freeze_queue(sdev->request_queue);

	lim = queue_limits_start_update(sdev->request_queue);

	lim.max_hw_sectors = ms;

	ret = queue_limits_commit_update(sdev->request_queue, &lim);

	blk_mq_unfreeze_queue(sdev->request_queue);



	ret = queue_limits_commit_update_frozen(sdev->request_queue, &lim);

	if (ret)

		return ret;

	return count;