block: don't reject too large max_user_sectors in blk_validate_limits

Commit Message

Christoph Hellwig March 26, 2024, 6:07 a.m. UTC

We already cap down the actual max_sectors to the max of the hardware
and user limit, so don't reject the configuration.

Signed-off-by: Christoph Hellwig <[e-mail]>
Reviewed-by: John Garry <[e-mail]>
Reviewed-by: Damien Le Moal <[e-mail]>
---
 block/blk-settings.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Jens Axboe March 26, 2024, 5:29 p.m. UTC | #1

On Tue, 26 Mar 2024 07:07:45 +0100, Christoph Hellwig wrote:
> We already cap down the actual max_sectors to the max of the hardware
> and user limit, so don't reject the configuration.
> 
> 

Applied, thanks!

[1/1] block: don't reject too large max_user_sectors in blk_validate_limits
      commit: 038105a200689ae07eb9e804ca2295e628a45820

Best regards,

Patch

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 3c7d8d638ab59d..cdbaef159c4bc3 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -146,8 +146,7 @@  static int blk_validate_limits(struct queue_limits *lim)
 	max_hw_sectors = min_not_zero(lim->max_hw_sectors,
 				lim->max_dev_sectors);
 	if (lim->max_user_sectors) {
-		if (lim->max_user_sectors > max_hw_sectors ||
-		    lim->max_user_sectors < PAGE_SIZE / SECTOR_SIZE)
+		if (lim->max_user_sectors < PAGE_SIZE / SECTOR_SIZE)
 			return -EINVAL;
 		lim->max_sectors = min(max_hw_sectors, lim->max_user_sectors);
 	} else {