]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
scsi: lpfc: remove null check on nvmebuf
authorColin Ian King <colin.king@canonical.com>
Fri, 13 Jul 2018 08:39:54 +0000 (09:39 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 31 Jul 2018 03:17:53 +0000 (23:17 -0400)
The null checks on nvmebuf are redundant as nvmebuf is always obtained from
a container_of() and hence can never be null. Remove all the redundant null
checks. This also cleans up a static analysis warning.

Detected by CoverityScan, CID#1471753 ("Dereference before null check")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/lpfc/lpfc_nvmet.c

index 22f8a204b69fafc58193647b30ad5ebb03b73cc6..b766afe10d3d7205936c548eec62f3ea9d02b32d 100644 (file)
@@ -1745,7 +1745,7 @@ lpfc_nvmet_unsol_ls_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        fc_hdr = (struct fc_frame_header *)(nvmebuf->hbuf.virt);
        oxid = be16_to_cpu(fc_hdr->fh_ox_id);
 
-       if (!nvmebuf || !phba->targetport) {
+       if (!phba->targetport) {
                lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,
                                "6154 LS Drop IO x%x\n", oxid);
                oxid = 0;
@@ -1770,8 +1770,7 @@ lpfc_nvmet_unsol_ls_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                lpfc_nvmeio_data(phba, "NVMET LS  DROP: "
                                 "xri x%x sz %d from %06x\n",
                                 oxid, size, sid);
-               if (nvmebuf)
-                       lpfc_in_buf_free(phba, &nvmebuf->dbuf);
+               lpfc_in_buf_free(phba, &nvmebuf->dbuf);
                return;
        }
        ctxp->phba = phba;
@@ -1814,8 +1813,7 @@ lpfc_nvmet_unsol_ls_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        ctxp->oxid, rc);
 
        /* We assume a rcv'ed cmd ALWAYs fits into 1 buffer */
-       if (nvmebuf)
-               lpfc_in_buf_free(phba, &nvmebuf->dbuf);
+       lpfc_in_buf_free(phba, &nvmebuf->dbuf);
 
        atomic_inc(&tgtp->xmt_ls_abort);
        lpfc_nvmet_unsol_ls_issue_abort(phba, ctxp, sid, oxid);