Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[safe/jmp/linux-2.6] / drivers / s390 / scsi / zfcp_scsi.c

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 4414720..0e1a346 100644 (file)
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -53,11 +53,11 @@ static int zfcp_scsi_slave_configure(struct scsi_device *sdp)
 
 static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result)
 {
+       struct zfcp_adapter *adapter =
+               (struct zfcp_adapter *) scpnt->device->host->hostdata[0];
        set_host_byte(scpnt, result);
        if ((scpnt->device != NULL) && (scpnt->device->host != NULL))
-               zfcp_scsi_dbf_event_result("fail", 4,
-                       (struct zfcp_adapter*) scpnt->device->host->hostdata[0],
-                       scpnt, NULL);
+               zfcp_dbf_scsi_result("fail", 4, adapter->dbf, scpnt, NULL);
        /* return directly */
        scpnt->scsi_done(scpnt);
 }
@@ -93,7 +93,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
        scsi_result = fc_remote_port_chkready(rport);
        if (unlikely(scsi_result)) {
                scpnt->result = scsi_result;
-               zfcp_scsi_dbf_event_result("fail", 4, adapter, scpnt, NULL);
+               zfcp_dbf_scsi_result("fail", 4, adapter->dbf, scpnt, NULL);
                scpnt->scsi_done(scpnt);
                return 0;
        }
@@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
        if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
                     !(status & ZFCP_STATUS_COMMON_RUNNING))) {
                zfcp_scsi_command_fail(scpnt, DID_ERROR);
-               return 0;;
+               return 0;
        }
 
        ret = zfcp_fsf_send_fcp_command_task(unit, scpnt);
@@ -181,8 +181,8 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
        spin_unlock(&adapter->req_list_lock);
        if (!old_req) {
                write_unlock_irqrestore(&adapter->abort_lock, flags);
-               zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL,
-                                         old_reqid);
+               zfcp_dbf_scsi_abort("lte1", adapter->dbf, scpnt, NULL,
+                                   old_reqid);
                return FAILED; /* completion could be in progress */
        }
        old_req->data = NULL;
@@ -198,8 +198,8 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
                zfcp_erp_wait(adapter);
                if (!(atomic_read(&adapter->status) &
                      ZFCP_STATUS_COMMON_RUNNING)) {
-                       zfcp_scsi_dbf_event_abort("nres", adapter, scpnt, NULL,
-                                                 old_reqid);
+                       zfcp_dbf_scsi_abort("nres", adapter->dbf, scpnt, NULL,
+                                           old_reqid);
                        return SUCCESS;
                }
        }
@@ -216,7 +216,7 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
                dbf_tag = "fail";
                retval = FAILED;
        }
-       zfcp_scsi_dbf_event_abort(dbf_tag, adapter, scpnt, abrt_req, old_reqid);
+       zfcp_dbf_scsi_abort(dbf_tag, adapter->dbf, scpnt, abrt_req, old_reqid);
        zfcp_fsf_req_free(abrt_req);
        return retval;
 }
@@ -237,8 +237,7 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags)
                zfcp_erp_wait(adapter);
                if (!(atomic_read(&adapter->status) &
                      ZFCP_STATUS_COMMON_RUNNING)) {
-                       zfcp_scsi_dbf_event_devreset("nres", tm_flags, unit,
-                                                    scpnt);
+                       zfcp_dbf_scsi_devreset("nres", tm_flags, unit, scpnt);
                        return SUCCESS;
                }
        }
@@ -248,13 +247,13 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags)
        wait_for_completion(&fsf_req->completion);
 
        if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCFAILED) {
-               zfcp_scsi_dbf_event_devreset("fail", tm_flags, unit, scpnt);
+               zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt);
                retval = FAILED;
        } else if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP) {
-               zfcp_scsi_dbf_event_devreset("nsup", tm_flags, unit, scpnt);
+               zfcp_dbf_scsi_devreset("nsup", tm_flags, unit, scpnt);
                retval = FAILED;
        } else
-               zfcp_scsi_dbf_event_devreset("okay", tm_flags, unit, scpnt);
+               zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt);
 
        zfcp_fsf_req_free(fsf_req);
        return retval;
@@ -492,21 +491,6 @@ static void zfcp_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout)
 }
 
 /**
- * zfcp_scsi_dev_loss_tmo_callbk - Free any reference to rport
- * @rport: The rport that is about to be deleted.
- */
-static void zfcp_scsi_dev_loss_tmo_callbk(struct fc_rport *rport)
-{
-       struct zfcp_port *port;
-
-       write_lock_irq(&zfcp_data.config_lock);
-       port = rport->dd_data;
-       if (port)
-               port->rport = NULL;
-       write_unlock_irq(&zfcp_data.config_lock);
-}
-
-/**
  * zfcp_scsi_terminate_rport_io - Terminate all I/O on a rport
  * @rport: The FC rport where to teminate I/O
  *
@@ -517,9 +501,12 @@ static void zfcp_scsi_dev_loss_tmo_callbk(struct fc_rport *rport)
 static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport)
 {
        struct zfcp_port *port;
+       struct Scsi_Host *shost = rport_to_shost(rport);
+       struct zfcp_adapter *adapter =
+               (struct zfcp_adapter *)shost->hostdata[0];
 
        write_lock_irq(&zfcp_data.config_lock);
-       port = rport->dd_data;
+       port = zfcp_get_port_by_wwpn(adapter, rport->port_name);
        if (port)
                zfcp_port_get(port);
        write_unlock_irq(&zfcp_data.config_lock);
@@ -551,7 +538,6 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port)
                return;
        }
 
-       rport->dd_data = port;
        rport->maxframe_size = port->maxframe_size;
        rport->supported_classes = port->supported_classes;
        port->rport = rport;
@@ -664,7 +650,6 @@ struct fc_function_template zfcp_transport_functions = {
        .reset_fc_host_stats = zfcp_reset_fc_host_stats,
        .set_rport_dev_loss_tmo = zfcp_set_rport_dev_loss_tmo,
        .get_host_port_state = zfcp_get_host_port_state,
-       .dev_loss_tmo_callbk = zfcp_scsi_dev_loss_tmo_callbk,
        .terminate_rport_io = zfcp_scsi_terminate_rport_io,
        .show_host_port_state = 1,
        .bsg_request = zfcp_execute_fc_job,