• Arnd Bergmann's avatar
    qla2xxx: avoid maybe_uninitialized warning · bc7095a9
    Arnd Bergmann authored
    The qlt_check_reserve_free_req() function produces an incorrect warning
    when CONFIG_PROFILE_ANNOTATED_BRANCHES is set:
    
    drivers/scsi/qla2xxx/qla_target.c: In function 'qlt_check_reserve_free_req':
    drivers/scsi/qla2xxx/qla_target.c:1887:3: error: 'cnt_in' may be used uninitialized in this function [-Werror=maybe-uninitialized]
       ql_dbg(ql_dbg_io, vha, 0x305a,
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           "qla_target(%d): There is no room in the request ring: vha->req->ring_index=%d, vha->req->cnt=%d, req_cnt=%d Req-out=%d Req-in=%d Req-Length=%d\n",
           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           vha->vp_idx, vha->req->ring_index,
           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           vha->req->cnt, req_cnt, cnt, cnt_in, vha->req->length);
           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/scsi/qla2xxx/qla_target.c:1887:3: error: 'cnt' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    
    The problem is that gcc fails to track the state of the condition across
    an annotated branch.
    
    This slightly rearranges the code to move the second if() block
    into the first one, to avoid the warning while retaining the
    behavior of the code.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    Acked-By: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
    Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
    bc7095a9
qla_target.c 186 KB