[PATCH v1 1/1] scsi_debug: check for bigger value first

[PATCH v1 1/1] scsi_debug: check for bigger value first

[Andy Shevchenko]

From: Andy Shevchenko <andy.shevchenko@gmail.com>

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

Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/scsi/scsi_debug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index dfcc45b..f773b34 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -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) {
-- 
2.6.2

Re: [PATCH v1 1/1] scsi_debug: check for bigger value first

[Johannes Thumshirn]

On Thu, 2015-11-26 at 20:22 +0200, Andy Shevchenko wrote:
> From: Andy Shevchenko <andy.shevchenko@gmail.com>
> 
> Even for signed types we have to check for bigger positive value first.
> Otherwise it will be never happened.
> 
> Acked-by: Douglas Gilbert <dgilbert@interlog.com>
> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
>  drivers/scsi/scsi_debug.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index dfcc45b..f773b34 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -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) {

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 1/1] scsi_debug: check for bigger value first

[Ewan Milne]

On Thu, 2015-11-26 at 20:22 +0200, Andy Shevchenko wrote:
> From: Andy Shevchenko <andy.shevchenko@gmail.com>
> 
> Even for signed types we have to check for bigger positive value first.
> Otherwise it will be never happened.
> 
> Acked-by: Douglas Gilbert <dgilbert@interlog.com>
> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
>  drivers/scsi/scsi_debug.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index dfcc45b..f773b34 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -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) {

Reviewed-by: Ewan D. Milne <emilne@redhat.com>

Re: [PATCH v1 1/1] scsi_debug: check for bigger value first

[Martin K. Petersen]

>>>>> "Andy" == Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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.

-- 
Martin K. Petersen	Oracle Linux Engineering