| Message ID | 20240324235448.2039074-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 038105a200689ae07eb9e804ca2295e628a45820 |
| Headers | show |
| Series | [01/23] block: don't reject too large max_user_setors in blk_validate_limits | expand |
On 3/25/24 08:54, 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. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks OK to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
On 24/03/2024 23:54, Christoph Hellwig wrote: /s/max_user_setors/max_user_sectors/ > 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 <hch@lst.de> Reviewed-by: John Garry <john.g.garry@oracle.com> > --- > block/blk-settings.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > 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 {
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 {
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 <hch@lst.de> --- block/blk-settings.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)