From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965451AbcCNPUE (ORCPT ); Mon, 14 Mar 2016 11:20:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:37798 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965414AbcCNPUC (ORCPT ); Mon, 14 Mar 2016 11:20:02 -0400 Subject: Re: [PATCH 2/3] lpfc: fix misleading indentation To: Arnd Bergmann , martin.petersen@oracle.com, James.Bottomley@HansenPartnership.com, James Smart , Dick Kennedy , "James E.J. Bottomley" References: <1457965789-3373916-1-git-send-email-arnd@arndb.de> <1457965789-3373916-3-git-send-email-arnd@arndb.de> Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Hannes Reinecke , Sebastian Herbszt From: Hannes Reinecke Message-ID: <56E6D69E.1050008@suse.de> Date: Mon, 14 Mar 2016 16:19:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457965789-3373916-3-git-send-email-arnd@arndb.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > 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)