Skip to contentSkip to conversation

scsi_debug: check for bigger value first

PATCH Applied Andy Shevchenko 4 participants 4 messages Nov 26, 2015 – Nov 30, 2015 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi_debug: check for bigger value first

From: Andy Shevchenko <[email protected]>

Even for signed types we have to check for bigger positive value first. Otherwise it will be never happened.

---
 drivers/scsi/scsi_debug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +3 -3
index dfcc45b..f773b34 100644
@@ -4846,10 +4846,10 @@ static int __init scsi_debug_init(void)
 	/* play around with geometry, don't waste too much on track 0 */
 	sdebug_heads = 8;
 	sdebug_sectors_per = 32;
-	if (scsi_debug_dev_size_mb >= 16)
-		sdebug_heads = 32;
-	else if (scsi_debug_dev_size_mb >= 256)
+	if (scsi_debug_dev_size_mb >= 256)
 		sdebug_heads = 64;
+	else if (scsi_debug_dev_size_mb >= 16)
+		sdebug_heads = 32;
 	sdebug_cylinders_per = (unsigned long)sdebug_capacity /
 			       (sdebug_sectors_per * sdebug_heads);
 	if (sdebug_cylinders_per >= 1024) {
Signature · 1 line
2.6.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 26 lines · Andy Shevchenko

From: Andy Shevchenko <[email protected]>

Even for signed types we have to check for bigger positive value first. Otherwise it will be never happened.

---
 drivers/scsi/scsi_debug.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +3 -3
index dfcc45b..f773b34 100644
@@ -4846,10 +4846,10 @@ static int __init scsi_debug_init(void)
  	/* play around with geometry, don't waste too much on track 0 */
  	sdebug_heads = 8;
  	sdebug_sectors_per = 32;
-	if (scsi_debug_dev_size_mb >= 16)
-		sdebug_heads = 32;
-	else if (scsi_debug_dev_size_mb >= 256)
+	if (scsi_debug_dev_size_mb >= 256)
  		sdebug_heads = 64;
+	else if (scsi_debug_dev_size_mb >= 16)
+		sdebug_heads = 32;
Quoted 3 lines

  sdebug_cylinders_per = (unsigned long)sdebug_capacity / (sdebug_sectors_per * sdebug_heads); if (sdebug_cylinders_per >= 1024) {

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by on v1 1/1
#2 lore raw
In reply to Andy Shevchenko
Quoted 19 lines · Andy Shevchenko

From: Andy Shevchenko <[email protected]>

Even for signed types we have to check for bigger positive value first. Otherwise it will be never happened.

---
 drivers/scsi/scsi_debug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +0 -0
index dfcc45b..f773b34 100644
@@ -4846,10 +4846,10 @@ static int __init scsi_debug_init(void)
 	/* play around with geometry, don't waste too much on track 0 */
 	sdebug_heads = 8;
 	sdebug_sectors_per = 32;

drivers/scsi/scsi_debug.c static int __init scsi_debug_init(void) · line 4855

Quoted 10 lines
drivers/scsi/scsi_debug.c +3 -3
-	if (scsi_debug_dev_size_mb >= 16)
-		sdebug_heads = 32;
-	else if (scsi_debug_dev_size_mb >= 256)
+	if (scsi_debug_dev_size_mb >= 256)
 		sdebug_heads = 64;
+	else if (scsi_debug_dev_size_mb >= 16)
+		sdebug_heads = 32;
 	sdebug_cylinders_per = (unsigned long)sdebug_capacity /
 			       (sdebug_sectors_per * sdebug_heads);
 	if (sdebug_cylinders_per >= 1024) {
#3 lore raw
In reply to Andy Shevchenko
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Andy" == Andy Shevchenko <[email protected]> writes:

Andy> Even for signed types we have to check for bigger positive value Andy> first. Otherwise it will be never happened.

Applied to 4.5/scsi-queue.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering