[PATCH] scsi:libiscsi:Fix an error count for active session

[PATCH] scsi:libiscsi:Fix an error count for active session

[wubo (T)]

From: Wu Bo <wubo40@huawei.com>

Fix an error count for active session if the total_cmds is invalid 
on the function iscsi_session_setup().
decrement the number of active sessions before the func return.

Signed-off-by: Wu Bo <wubo40@huawei.com>
---
 drivers/scsi/libiscsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 70b99c0..b7158eb 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2771,7 +2771,7 @@ struct iscsi_cls_session *
                       "must be a power of 2.\n", total_cmds);
                total_cmds = rounddown_pow_of_two(total_cmds);
                if (total_cmds < ISCSI_TOTAL_CMDS_MIN)
-                       return NULL;
+                       goto dec_session_count;
                printk(KERN_INFO "iscsi: Rounding can_queue to %d.\n",
                       total_cmds);
        }
--
1.8.3.1

Re: [PATCH] scsi:libiscsi:Fix an error count for active session

[Lee Duncan]

On 3/24/20 11:53 PM, wubo (T) wrote:
> From: Wu Bo <wubo40@huawei.com>
> 
> Fix an error count for active session if the total_cmds is invalid 
> on the function iscsi_session_setup().
> decrement the number of active sessions before the func return.
> 
> Signed-off-by: Wu Bo <wubo40@huawei.com>
> ---
>  drivers/scsi/libiscsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
> index 70b99c0..b7158eb 100644
> --- a/drivers/scsi/libiscsi.c
> +++ b/drivers/scsi/libiscsi.c
> @@ -2771,7 +2771,7 @@ struct iscsi_cls_session *
>                        "must be a power of 2.\n", total_cmds);
>                 total_cmds = rounddown_pow_of_two(total_cmds);
>                 if (total_cmds < ISCSI_TOTAL_CMDS_MIN)
> -                       return NULL;
> +                       goto dec_session_count;
>                 printk(KERN_INFO "iscsi: Rounding can_queue to %d.\n",
>                        total_cmds);
>         }
> --
> 1.8.3.1
> 

Reviewed-by: Lee Duncan <lduncan@suuse.com>

Re: [PATCH] scsi:libiscsi:Fix an error count for active session

[Martin K. Petersen]

wubo,

> Fix an error count for active session if the total_cmds is invalid on
> the function iscsi_session_setup().  decrement the number of active
> sessions before the func return.

Applied to 5.7/scsi-queue, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering