From: Hannes Reinecke <hare@suse.de>
To: Arnd Bergmann <arnd@arndb.de>,
martin.petersen@oracle.com,
James.Bottomley@HansenPartnership.com,
James Smart <james.smart@avagotech.com>,
Dick Kennedy <dick.kennedy@avagotech.com>,
"James E.J. Bottomley" <JBottomley@odin.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Hannes Reinecke <hare@suse.com>,
Sebastian Herbszt <herbszt@gmx.de>
Subject: Re: [PATCH 2/3] lpfc: fix misleading indentation
Date: Mon, 14 Mar 2016 16:19:58 +0100 [thread overview]
Message-ID: <56E6D69E.1050008@suse.de> (raw)
In-Reply-To: <1457965789-3373916-3-git-send-email-arnd@arndb.de>
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)
next prev parent reply other threads:[~2016-03-14 15:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 14:29 gcc-6.0 warnings for scsi Arnd Bergmann
2016-03-14 14:29 ` [PATCH 1/3] aacraid: add missing curly braces Arnd Bergmann
2016-03-18 19:20 ` Martin K. Petersen
2016-03-18 20:50 ` Raghava Aditya Renukunta
2016-03-22 0:26 ` Martin K. Petersen
2016-03-14 14:29 ` [PATCH 2/3] lpfc: fix misleading indentation Arnd Bergmann
2016-03-14 15:19 ` Hannes Reinecke [this message]
2016-03-14 15:25 ` Arnd Bergmann
2016-03-14 15:26 ` Hannes Reinecke
2016-03-14 15:48 ` Ewan Milne
2016-03-14 22:27 ` Sebastian Herbszt
2016-03-18 19:22 ` Martin K. Petersen
2016-03-14 14:29 ` [PATCH 3/3] megaraid_sas: add missing curly braces in ioctl handler Arnd Bergmann
2016-03-14 15:20 ` Hannes Reinecke
2016-03-15 11:08 ` Sumit Saxena
2016-03-18 19:23 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56E6D69E.1050008@suse.de \
--to=hare@suse.de \
--cc=JBottomley@odin.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@arndb.de \
--cc=dick.kennedy@avagotech.com \
--cc=hare@suse.com \
--cc=herbszt@gmx.de \
--cc=james.smart@avagotech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).