From: James Smart <james.smart@emulex.com>
Date: Tue, 14 Aug 2012 18:26:13 +0000 (-0400)
Subject: [SCSI] lpfc 8.3.34: Add XRI to abort handler timeout log message
X-Git-Tag: firefly_0821_release~3680^2~1940^2^2~132
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=247ca945d8153c96dd10fc94f12b36bd4cb3ecfd;p=firefly-linux-kernel-4.4.55.git

[SCSI] lpfc 8.3.34: Add XRI to abort handler timeout log message

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index b2c7d805bac9..5ab21f7dc3fc 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4502,9 +4502,10 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
 		ret = FAILED;
 		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,
 				 "0748 abort handler timed out waiting "
-				 "for abort to complete: ret %#x, ID %d, "
-				 "LUN %d\n",
-				 ret, cmnd->device->id, cmnd->device->lun);
+				 "for abortng I/O (xri:x%x) to complete: "
+				 "ret %#x, ID %d, LUN %d\n",
+				 iocb->sli4_xritag, ret,
+				 cmnd->device->id, cmnd->device->lun);
 	}
 	goto out;