[SCSI] libfc: add print of exchange id for debugging fc_fcp

This is very helpful to match up the corresponding exchange to the actual I/O
described by the fsp, particularly when you do a side-by-side comparison of
the syslog with your trace.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
index 16d2162dda1..eea0c3541b7 100644
--- a/drivers/scsi/libfc/fc_libfc.h
+++ b/drivers/scsi/libfc/fc_libfc.h
@@ -66,9 +66,21 @@ extern unsigned int fc_debug_logging;
 
 #define FC_FCP_DBG(pkt, fmt, args...)                                   \
         FC_CHECK_LOGGING(FC_FCP_LOGGING,                                \
-                         printk(KERN_INFO "host%u: fcp: %6.6x: " fmt,   \
+        {                                                               \
+                if ((pkt)->seq_ptr) {                                   \
+                        struct fc_exch *_ep = NULL;                     \
+                        _ep = fc_seq_exch((pkt)->seq_ptr);              \
+                        printk(KERN_INFO "host%u: fcp: %6.6x: "         \
+                                "xid %04x-%04x: " fmt,                  \
                                 (pkt)->lp->host->host_no,               \
-                                pkt->rport->port_id, ##args))
+                                (pkt)->rport->port_id,                  \
+                                (_ep)->oxid, (_ep)->rxid, ##args);      \
+                } else {                                                \
+                        printk(KERN_INFO "host%u: fcp: %6.6x: " fmt,    \
+                                (pkt)->lp->host->host_no,               \
+                                (pkt)->rport->port_id, ##args);         \
+                }                                                       \
+        })
 
 #define FC_EXCH_DBG(exch, fmt, args...)                                 \
         FC_CHECK_LOGGING(FC_EXCH_LOGGING,                               \