[SCSI] zfcp: Use SCSI device data zfcp_scsi_dev instead of zfcp_unit

This is the large change to switch from using the data in
zfcp_unit to zfcp_scsi_dev. Keeping everything working requires doing
the switch in one piece. To ensure that no code keeps using the data
in zfcp_unit, this patch also removes the data from zfcp_unit that is
now being replaced with zfcp_scsi_dev.

For zfcp, the scsi_device together with zfcp_scsi_dev exist from the
call of slave_alloc to the call of slave_destroy. The data in
zfcp_scsi_dev is initialized in zfcp_scsi_slave_alloc and the LUN is
opened; the final shutdown for the LUN is run from slave_destroy.

Where the scsi_device or zfcp_scsi_dev is needed, the pointer to the
scsi_device is passed as function argument and inside the function
converted to the pointer to zfcp_scsi_dev; this avoids back and forth
conversion betweeen scsi_device and zfcp_scsi_dev.

While changing the function arguments from zfcp_unit to scsi_device,
the functions names are renamed form "unit" to "lun". This is to have
a seperation between zfcp_scsi_dev/LUN and the zfcp_unit; only code
referring to the remaining configuration information in zfcp_unit
struct uses "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>

1 files changed, 0 insertions, 11 deletions

diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index e210c41ee389..1119c535a667 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -134,14 +134,7 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
         unit->fcp_lun = fcp_lun;
         unit->dev.parent = &port->dev;
         unit->dev.release = zfcp_unit_release;
-        unit->latencies.write.channel.min = 0xFFFFFFFF;
-        unit->latencies.write.fabric.min = 0xFFFFFFFF;
-        unit->latencies.read.channel.min = 0xFFFFFFFF;
-        unit->latencies.read.fabric.min = 0xFFFFFFFF;
-        unit->latencies.cmd.channel.min = 0xFFFFFFFF;
-        unit->latencies.cmd.fabric.min = 0xFFFFFFFF;
         INIT_WORK(&unit->scsi_work, zfcp_unit_scsi_scan_work);
-        spin_lock_init(&unit->latencies.lock);
 
         if (dev_set_name(&unit->dev, "0x%016llx",
                          (unsigned long long) fcp_lun)) {
@@ -165,9 +158,6 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
         list_add_tail(&unit->list, &port->unit_list);
         write_unlock_irq(&port->unit_list_lock);
 
-        atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status);
-        zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL);
-        zfcp_erp_wait(unit->port->adapter);
         zfcp_unit_scsi_scan(unit);
 
         return 0;
@@ -248,7 +238,6 @@ int zfcp_unit_remove(struct zfcp_port *port, u64 fcp_lun)
 
         put_device(&unit->dev);
 
-        zfcp_erp_unit_shutdown(unit, 0, "unrem_1", NULL);
         zfcp_device_unregister(&unit->dev, &zfcp_sysfs_unit_attrs);
 
         return 0;