Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1357358

Re: [PATCH 2/3] lpfc: fix misleading indentation

Show all headers | View raw

On 03/14/2016 03:29 PM, Arnd Bergmann wrote:
> gcc-6 complains about the indentation of the lpfc_destroy_vport_work_array()
> call in lpfc_online(), which clearly doesn't look right:
> 
> drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_online':
> drivers/scsi/lpfc/lpfc_init.c:2880:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
>    lpfc_destroy_vport_work_array(phba, vports);
>    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/scsi/lpfc/lpfc_init.c:2863:2: note: ...this 'if' clause, but it is not
>   if (vports != NULL)
>   ^~
> 
> Looking at the patch that introduced this code, it's clear that the
> behavior is correct and the indentation is wrong.
> 
> This fixes the indentation and adds curly braces around the previous
> if() block for clarity, as that is most likely what caused the code
> to be misindented in the first place.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 549e55cd2a1b ("[SCSI] lpfc 8.2.2 : Fix locking around HBA's port_list")
> ---
>  drivers/scsi/lpfc/lpfc_init.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index a544366a367e..f57d02c3b6cf 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -2860,7 +2860,7 @@ lpfc_online(struct lpfc_hba *phba)
>  	}
>  
>  	vports = lpfc_create_vport_work_array(phba);
> -	if (vports != NULL)
> +	if (vports != NULL) {
>  		for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {
>  			struct Scsi_Host *shost;
>  			shost = lpfc_shost_from_vport(vports[i]);
> @@ -2877,7 +2877,8 @@ lpfc_online(struct lpfc_hba *phba)
>  			}
>  			spin_unlock_irq(shost->host_lock);
>  		}
> -		lpfc_destroy_vport_work_array(phba, vports);
> +	}
> +	lpfc_destroy_vport_work_array(phba, vports);
>  
>  	lpfc_unblock_mgmt_io(phba);
>  	return 0;
> 
Nope.

vports is only valid from within the indentation block, so it should
be moved into it.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		   Teamlead Storage & Networking
hare@suse.de			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] lpfc: fix misleading indentation Arnd Bergmann <arnd@arndb.de> - 2016-03-14 15:40 +0100
  Re: [PATCH 2/3] lpfc: fix misleading indentation Arnd Bergmann <arnd@arndb.de> - 2016-03-14 16:30 +0100
    Re: [PATCH 2/3] lpfc: fix misleading indentation Hannes Reinecke <hare@suse.de> - 2016-03-14 16:30 +0100
      Re: [PATCH 2/3] lpfc: fix misleading indentation Ewan Milne <emilne@redhat.com> - 2016-03-14 16:50 +0100
  Re: [PATCH 2/3] lpfc: fix misleading indentation Hannes Reinecke <hare@suse.de> - 2016-03-14 16:30 +0100
  Re: [PATCH 2/3] lpfc: fix misleading indentation Sebastian Herbszt <herbszt@gmx.de> - 2016-03-14 23:30 +0100

csiph-web