mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:41:44 +00:00
sd: also set max_user_sectors when setting max_sectors
sd can set a max_sectors value that is lower than the max_hw_sectors
limit based on the block limits VPD page. While this is rather unusual,
it used to work until the max_user_sectors field was split out to cleanly
deal with conflicting hardware and user limits when the hardware limit
changes. Also set max_user_sectors to ensure the limit can properly be
stacked.
Fixes: 4f563a6473
("block: add a max_user_discard_sectors queue limit")
Reported-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mike Snitzer <snitzer@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240523182618.602003-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
233e27b4d2
commit
bafea1c58b
|
@ -3700,8 +3700,10 @@ static int sd_revalidate_disk(struct gendisk *disk)
|
|||
*/
|
||||
if (sdkp->first_scan ||
|
||||
q->limits.max_sectors > q->limits.max_dev_sectors ||
|
||||
q->limits.max_sectors > q->limits.max_hw_sectors)
|
||||
q->limits.max_sectors > q->limits.max_hw_sectors) {
|
||||
q->limits.max_sectors = rw_max;
|
||||
q->limits.max_user_sectors = rw_max;
|
||||
}
|
||||
|
||||
sdkp->first_scan = 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue