From facfb5f1db2ea7a75a86f2c1778ada002a44cea9 Mon Sep 17 00:00:00 2001
From: James Smart <james.smart@emulex.com>
Date: Tue, 14 Aug 2012 14:26:13 -0400
Subject: [PATCH] --- yaml --- r: 328810 b: refs/heads/master c:
 247ca945d8153c96dd10fc94f12b36bd4cb3ecfd h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/lpfc/lpfc_scsi.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5f24e4843c9e..7fe01e47fb5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa1c7ee74a0af0a84bf6cdb0a77ad1510ec04fa9
+refs/heads/master: 247ca945d8153c96dd10fc94f12b36bd4cb3ecfd
diff --git a/trunk/drivers/scsi/lpfc/lpfc_scsi.c b/trunk/drivers/scsi/lpfc/lpfc_scsi.c
index b2c7d805bac9..5ab21f7dc3fc 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/trunk/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;