lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 048/115] lpfc: fix misleading indentation
    3.2.80-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit aeb6641f8ebdd61939f462a8255b316f9bfab707 upstream.

    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")
    Reviewed-by: Sebastian Herbszt <herbszt@gmx.de>
    Reviewed-by: Hannes Reinecke <hare@suse.com>
    Reviewed-by: Ewan D. Milne <emilne@redhat.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/scsi/lpfc/lpfc_init.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/scsi/lpfc/lpfc_init.c
    +++ b/drivers/scsi/lpfc/lpfc_init.c
    @@ -2526,7 +2526,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]);
    @@ -2538,7 +2538,8 @@ lpfc_online(struct lpfc_hba *phba)
    vports[i]->fc_flag |= FC_VPORT_NEEDS_INIT_VPI;
    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;
    \
     
     \ /
      Last update: 2016-04-27 02:01    [W:2.302 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site