Re: [PATCH 3/4] scsi: sg: use queue_logical_sector_size() in max_sectors_bytes()

Douglas Gilbert <dgilbert@xxxxxxxxxxxx> · Sat, 5 Sep 2020 14:37:34 -0400

On 2020-09-04 4:05 p.m., Tom Yan wrote:
Signed-off-by: Tom Yan <tom.ty89@xxxxxxxxx>

Acked-by: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>

---
  drivers/scsi/sg.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 0e3f084141a3..deeab4855172 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -848,10 +848,11 @@ static int srp_done(Sg_fd *sfp, Sg_request *srp)
  static int max_sectors_bytes(struct request_queue *q)
  {
  	unsigned int max_sectors = queue_max_sectors(q);
+	unsigned int logical_block_size = queue_logical_block_size(q);
  
-	max_sectors = min_t(unsigned int, max_sectors, INT_MAX >> 9);
+	max_sectors = min_t(unsigned int, max_sectors, USHRT_MAX);
  
-	return max_sectors << 9;
+	return max_sectors * logical_block_size;
  }
  
  static void








