* [PATCH 1/2] scsi: sg: use queue_logical_block_size() in max_sectors_bytes()
@ 2020-09-17 16:00 Tom Yan
2020-09-17 16:00 ` [PATCH 2/2] block/scsi_ioctl.c: " Tom Yan
0 siblings, 1 reply; 3+ messages in thread
From: Tom Yan @ 2020-09-17 16:00 UTC (permalink / raw)
To: linux-scsi; +Cc: Tom Yan
Logical block size was never / is no longer necessarily 512.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
---
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 20472aaaf630..8a2cca71017f 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);
+ 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 void
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] block/scsi_ioctl.c: use queue_logical_block_size() in max_sectors_bytes()
2020-09-17 16:00 [PATCH 1/2] scsi: sg: use queue_logical_block_size() in max_sectors_bytes() Tom Yan
@ 2020-09-17 16:00 ` Tom Yan
0 siblings, 0 replies; 3+ messages in thread
From: Tom Yan @ 2020-09-17 16:00 UTC (permalink / raw)
To: linux-scsi; +Cc: Tom Yan
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(-)
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)
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] scsi: sg: use queue_logical_block_size() in max_sectors_bytes()
@ 2020-09-23 5:52 Tom Yan
2020-09-23 5:52 ` [PATCH 2/2] block/scsi_ioctl.c: " Tom Yan
0 siblings, 1 reply; 3+ messages in thread
From: Tom Yan @ 2020-09-23 5:52 UTC (permalink / raw)
To: linux-scsi; +Cc: Tom Yan
Logical block size was never / is no longer necessarily 512.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
---
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 20472aaaf630..8a2cca71017f 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);
+ 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 void
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] block/scsi_ioctl.c: use queue_logical_block_size() in max_sectors_bytes()
2020-09-23 5:52 [PATCH 1/2] scsi: sg: " Tom Yan
@ 2020-09-23 5:52 ` Tom Yan
0 siblings, 0 replies; 3+ messages in thread
From: Tom Yan @ 2020-09-23 5:52 UTC (permalink / raw)
To: linux-scsi; +Cc: Tom Yan
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(-)
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)
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-23 5:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 16:00 [PATCH 1/2] scsi: sg: use queue_logical_block_size() in max_sectors_bytes() Tom Yan
2020-09-17 16:00 ` [PATCH 2/2] block/scsi_ioctl.c: " Tom Yan
-- strict thread matches above, loose matches on Subject: below --
2020-09-23 5:52 [PATCH 1/2] scsi: sg: " Tom Yan
2020-09-23 5:52 ` [PATCH 2/2] block/scsi_ioctl.c: " Tom Yan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.