| Message ID | 20200923055248.1901-2-tom.ty89@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] scsi: sg: use queue_logical_block_size() in max_sectors_bytes() | expand |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index ef722f04f88a..82ed73f07460 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -73,10 +73,11 @@ static int sg_set_timeout(struct request_queue *q, int __user *p) static int max_sectors_bytes(struct request_queue *q) { unsigned int max_sectors = queue_max_sectors(q); + max_sectors *= queue_logical_block_size(q); - max_sectors = min_t(unsigned int, max_sectors, INT_MAX >> 9); + max_sectors = min_t(unsigned int, max_sectors, INT_MAX); - return max_sectors << 9; + return max_sectors; } static int sg_get_reserved_size(struct request_queue *q, int __user *p)
Logical block size was never / is no longer necessarily 512. Signed-off-by: Tom Yan <tom.ty89@gmail.com> --- block/scsi_ioctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)