[SCSI] zfcp: Dont use 0 to indicate invalid LUN in rec trace

0 is a valid value for a LUN. It is slightly confusing to also see 0
in the trace entries relating to adapter and port. Change this to use
0xFFFFFFFFFFFFFFFF in the LUN field when the trace entry does not
relate to a LUN or unit.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 8 insertions, 6 deletions

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 818b6ad935a..c8d68fec633 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -576,7 +576,8 @@ void zfcp_dbf_rec_adapter(char *id, void *ref, struct zfcp_dbf *dbf)
         struct zfcp_adapter *adapter = dbf->adapter;
 
         zfcp_dbf_rec_target(id, ref, dbf, &adapter->status,
-                                  &adapter->erp_counter, 0, 0, 0);
+                            &adapter->erp_counter, 0, 0,
+                            ZFCP_DBF_INVALID_LUN);
 }
 
 /**
@@ -590,8 +591,8 @@ void zfcp_dbf_rec_port(char *id, void *ref, struct zfcp_port *port)
         struct zfcp_dbf *dbf = port->adapter->dbf;
 
         zfcp_dbf_rec_target(id, ref, dbf, &port->status,
-                                  &port->erp_counter, port->wwpn, port->d_id,
-                                  0);
+                            &port->erp_counter, port->wwpn, port->d_id,
+                            ZFCP_DBF_INVALID_LUN);
 }
 
 /**
@@ -642,10 +643,9 @@ void zfcp_dbf_rec_trigger(char *id2, void *ref, u8 want, u8 need, void *action,
                 r->u.trigger.ps = atomic_read(&port->status);
                 r->u.trigger.wwpn = port->wwpn;
         }
-        if (unit) {
+        if (unit)
                 r->u.trigger.us = atomic_read(&unit->status);
-                r->u.trigger.fcp_lun = unit->fcp_lun;
-        }
+        r->u.trigger.fcp_lun = unit ? unit->fcp_lun : ZFCP_DBF_INVALID_LUN;
         debug_event(dbf->rec, action ? 1 : 4, r, sizeof(*r));
         spin_unlock_irqrestore(&dbf->rec_lock, flags);
 }
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index e4b5317fe90..ca841ee44c1 100644
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -30,6 +30,8 @@
 #define ZFCP_DBF_TAG_SIZE      4
 #define ZFCP_DBF_ID_SIZE       7
 
+#define ZFCP_DBF_INVALID_LUN    0xFFFFFFFFFFFFFFFFull
+
 struct zfcp_dbf_dump {
         u8 tag[ZFCP_DBF_TAG_SIZE];
         u32 total_size;         /* size of total dump data */