zfcp: transport class adaptations
Subsystems (3)
PATCH 1/1 zfcp: transport class adaptations
From: Andreas Herrmann <[email protected]>
[PATCH] zfcp: transport class adaptations
Added host stats, removed superfluous get_starget_ functions, removed some attributes from zfcp specific sysfs tree (e.g. scsi_host_no, scsi_lun, wwnn and d_id).
Host stats are given for the physical adapter port not for the virtual adapter. Reset stats is implemented in the device driver.
Signed-off-by Andreas Herrmann <[email protected]>
---
drivers/s390/scsi/zfcp_aux.c | 2 drivers/s390/scsi/zfcp_def.h | 3 + drivers/s390/scsi/zfcp_scsi.c | 185 +++++++++++++++++++++++--------- drivers/s390/scsi/zfcp_sysfs_adapter.c | 4 - drivers/s390/scsi/zfcp_sysfs_port.c | 4 - drivers/s390/scsi/zfcp_sysfs_unit.c | 2 6 files changed, 136 insertions(+), 64 deletions(-)
a5740402320b5f6122dd869aab0961f58f6d0abc
drivers/s390/scsi/zfcp_aux.c +2 -0
@@ -1125,6 +1125,8 @@ zfcp_adapter_dequeue(struct zfcp_adapterzfcp_free_low_mem_buffers (adapter);/* free memory of adapter data structure and queues */ zfcp_qdio_free_queues (adapter); +kfree (adapter->fc_stats); +kfree (adapter->stats_reset_data);ZFCP_LOG_TRACE ("freeing adapter structure\n" );kfree (adapter); out:
drivers/s390/scsi/zfcp_def.h +3 -0
@@ -978,6 +978,9 @@ struct zfcp_adapter {struct zfcp_adapter_mempool pool;/* Adapter memory pools */ struct qdio_initialize qdio_init_data;/* for qdio_establish */ struct device generic_services;/* directory for WKA ports */ +struct fc_host_statistics *fc_stats; +struct fsf_qtcb_bottom_port *stats_reset_data; +unsigned long stats_reset; };/*
drivers/s390/scsi/zfcp_scsi.c +131 -54
224 lines not on this page · raw message
drivers/s390/scsi/zfcp_sysfs_adapter.c +0 -4
@@ -69,12 +69,10 @@ ZFCP_DEFINE_ADAPTER_ATTR(physical_wwpn,ZFCP_DEFINE_ADAPTER_ATTR (physical_s_id,"0x%06x\n" , adapter->physical_s_id);ZFCP_DEFINE_ADAPTER_ATTR (card_version,"0x%04x\n" , adapter->hydra_version);ZFCP_DEFINE_ADAPTER_ATTR (lic_version,"0x%08x\n" , adapter->fsf_lic_version); -ZFCP_DEFINE_ADAPTER_ATTR (fc_service_class,"%d\n" , adapter->fc_service_class);ZFCP_DEFINE_ADAPTER_ATTR (fc_topology,"%s\n" , fc_topologies[adapter->fc_topology]);ZFCP_DEFINE_ADAPTER_ATTR (hardware_version,"0x%08x\n" , adapter->hardware_version); -ZFCP_DEFINE_ADAPTER_ATTR (scsi_host_no,"0x%x\n" , adapter->scsi_host_no);ZFCP_DEFINE_ADAPTER_ATTR (in_recovery,"%d\n" ,atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE , &adapter->status));
@@ -259,9 +257,7 @@ static struct attribute *zfcp_adapter_at &dev_attr_physical_s_id.attr, &dev_attr_card_version.attr, &dev_attr_lic_version.attr, - &dev_attr_fc_service_class.attr, &dev_attr_fc_topology.attr, - &dev_attr_scsi_host_no.attr, &dev_attr_status.attr, &dev_attr_hardware_version.attr,NULL
drivers/s390/scsi/zfcp_sysfs_port.c +0 -4
@@ -65,8 +65,6 @@ static ssize_t zfcp_sysfs_port_##_name## static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_port_##_name##_show, NULL);ZFCP_DEFINE_PORT_ATTR (status,"0x%08x\n" ,atomic_read (&port->status)); -ZFCP_DEFINE_PORT_ATTR (wwnn,"0x%016llx\n" , port->wwnn); -ZFCP_DEFINE_PORT_ATTR (d_id,"0x%06x\n" , port->d_id);ZFCP_DEFINE_PORT_ATTR (in_recovery,"%d\n" ,atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE , &port->status)); ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask
@@ -245,8 +243,6 @@ static struct attribute *zfcp_port_commo &dev_attr_failed.attr, &dev_attr_in_recovery.attr, &dev_attr_status.attr, - &dev_attr_wwnn.attr, - &dev_attr_d_id.attr, &dev_attr_access_denied.attr, NULL };
drivers/s390/scsi/zfcp_sysfs_unit.c +0 -2
@@ -65,7 +65,6 @@ static ssize_t zfcp_sysfs_unit_##_name## static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_unit_##_name##_show, NULL);ZFCP_DEFINE_UNIT_ATTR (status,"0x%08x\n" ,atomic_read (&unit->status)); -ZFCP_DEFINE_UNIT_ATTR (scsi_lun,"0x%x\n" , unit->scsi_lun);ZFCP_DEFINE_UNIT_ATTR (in_recovery,"%d\n" ,atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE , &unit->status)); ZFCP_DEFINE_UNIT_ATTR(access_denied, "%d\n", atomic_test_mask
@@ -138,7 +137,6 @@ static DEVICE_ATTR(failed, S_IWUSR | S_I zfcp_sysfs_unit_failed_store);static struct attribute *zfcp_unit_attrs[] = { - &dev_attr_scsi_lun.attr, &dev_attr_failed.attr, &dev_attr_in_recovery.attr, &dev_attr_status.attr,
Signature · 1 line
0.99.9n-g58e3