1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index a86117b0d6e1..2cdd6b28ff7f 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -154,7 +154,6 @@ void _zfcp_dbf_hba_fsf_response(const char *tag2, int level,
                 scsi_cmnd = (struct scsi_cmnd *)fsf_req->data;
                 if (scsi_cmnd) {
                         response->u.fcp.cmnd = (unsigned long)scsi_cmnd;
-                        response->u.fcp.serial = scsi_cmnd->serial_number;
                         response->u.fcp.data_dir =
                                 qtcb->bottom.io.data_direction;
                 }
@@ -330,7 +329,6 @@ static void zfcp_dbf_hba_view_response(char **p,
                         break;
                 zfcp_dbf_out(p, "data_direction", "0x%04x", r->u.fcp.data_dir);
                 zfcp_dbf_out(p, "scsi_cmnd", "0x%0Lx", r->u.fcp.cmnd);
-                zfcp_dbf_out(p, "scsi_serial", "0x%016Lx", r->u.fcp.serial);
                 *p += sprintf(*p, "\n");
                 break;
 
@@ -482,7 +480,7 @@ static int zfcp_dbf_rec_view_format(debug_info_t *id, struct debug_view *view,
                 zfcp_dbf_out(&p, "fcp_lun", "0x%016Lx", r->u.trigger.fcp_lun);
                 zfcp_dbf_out(&p, "adapter_status", "0x%08x", r->u.trigger.as);
                 zfcp_dbf_out(&p, "port_status", "0x%08x", r->u.trigger.ps);
-                zfcp_dbf_out(&p, "unit_status", "0x%08x", r->u.trigger.us);
+                zfcp_dbf_out(&p, "lun_status", "0x%08x", r->u.trigger.ls);
                 break;
         case ZFCP_REC_DBF_ID_ACTION:
                 zfcp_dbf_out(&p, "erp_action", "0x%016Lx", r->u.action.action);
@@ -600,19 +598,20 @@ void zfcp_dbf_rec_port(char *id, void *ref, struct zfcp_port *port)
 }
 
 /**
- * zfcp_dbf_rec_unit - trace event for unit state change
+ * zfcp_dbf_rec_lun - trace event for LUN state change
  * @id: identifier for trigger of state change
  * @ref: additional reference (e.g. request)
- * @unit: unit
+ * @sdev: SCSI device
  */
-void zfcp_dbf_rec_unit(char *id, void *ref, struct zfcp_unit *unit)
+void zfcp_dbf_rec_lun(char *id, void *ref, struct scsi_device *sdev)
 {
-        struct zfcp_port *port = unit->port;
+        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
+        struct zfcp_port *port = zfcp_sdev->port;
         struct zfcp_dbf *dbf = port->adapter->dbf;
 
-        zfcp_dbf_rec_target(id, ref, dbf, &unit->status,
-                                  &unit->erp_counter, port->wwpn, port->d_id,
-                                  unit->fcp_lun);
+        zfcp_dbf_rec_target(id, ref, dbf, &zfcp_sdev->status,
+                            &zfcp_sdev->erp_counter, port->wwpn, port->d_id,
+                            zfcp_scsi_dev_lun(sdev));
 }
 
 /**
@@ -624,11 +623,11 @@ void zfcp_dbf_rec_unit(char *id, void *ref, struct zfcp_unit *unit)
  * @action: address of error recovery action struct
  * @adapter: adapter
  * @port: port
- * @unit: unit
+ * @sdev: SCSI device
  */
 void zfcp_dbf_rec_trigger(char *id2, void *ref, u8 want, u8 need, void *action,
                           struct zfcp_adapter *adapter, struct zfcp_port *port,
-                          struct zfcp_unit *unit)
+                          struct scsi_device *sdev)
 {
         struct zfcp_dbf *dbf = adapter->dbf;
         struct zfcp_dbf_rec_record *r = &dbf->rec_buf;
@@ -647,9 +646,10 @@ 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)
-                r->u.trigger.us = atomic_read(&unit->status);
-        r->u.trigger.fcp_lun = unit ? unit->fcp_lun : ZFCP_DBF_INVALID_LUN;
+        if (sdev)
+                r->u.trigger.ls = atomic_read(&sdev_to_zfcp(sdev)->status);
+        r->u.trigger.fcp_lun = sdev ? zfcp_scsi_dev_lun(sdev) :
+                                      ZFCP_DBF_INVALID_LUN;
         debug_event(dbf->rec, action ? 1 : 4, r, sizeof(*r));
         spin_unlock_irqrestore(&dbf->rec_lock, flags);
 }
@@ -879,7 +879,6 @@ void _zfcp_dbf_scsi(const char *tag, const char *tag2, int level,
                                 }
                                 rec->scsi_result = scsi_cmnd->result;
                                 rec->scsi_cmnd = (unsigned long)scsi_cmnd;
-                                rec->scsi_serial = scsi_cmnd->serial_number;
                                 memcpy(rec->scsi_opcode, scsi_cmnd->cmnd,
                                         min((int)scsi_cmnd->cmd_len,
                                                 ZFCP_DBF_SCSI_OPCODE));
@@ -948,7 +947,6 @@ static int zfcp_dbf_scsi_view_format(debug_info_t *id, struct debug_view *view,
         zfcp_dbf_out(&p, "scsi_lun", "0x%08x", r->scsi_lun);
         zfcp_dbf_out(&p, "scsi_result", "0x%08x", r->scsi_result);
         zfcp_dbf_out(&p, "scsi_cmnd", "0x%0Lx", r->scsi_cmnd);
-        zfcp_dbf_out(&p, "scsi_serial", "0x%016Lx", r->scsi_serial);
         zfcp_dbf_outd(&p, "scsi_opcode", r->scsi_opcode, ZFCP_DBF_SCSI_OPCODE,
                       0, ZFCP_DBF_SCSI_OPCODE);
         zfcp_dbf_out(&p, "scsi_retries", "0x%02x", r->scsi_retries);