zfcp: bugfix and compile fixes
Subsystems (3)
PATCH 1/1 zfcp: bugfix and compile fixes
Hi James,
unfortunately the last zfcp patch introduces a bug and the driver doesn't compile anymore in addition. If possible the patch below should go into 2.6.13.
Thanks,
Heiko
From: Heiko Carstens <[email protected]>
Bugfix (usage of uninitialized pointer in zfcp_port_dequeue) and compile fixes for the zfcp device driver.
Signed-off-by Heiko Carstens <[email protected]>
diffstat:
drivers/s390/scsi/zfcp_aux.c | 5 ++--- drivers/s390/scsi/zfcp_ccw.c | 2 +- drivers/s390/scsi/zfcp_sysfs_port.c | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/s390/scsi/zfcp_aux.c +2 -3
@@ -1403,15 +1403,14 @@ zfcp_port_enqueue(struct zfcp_adapter *avoid zfcp_port_dequeue (struct zfcp_port *port) { -struct fc_port *rport; -zfcp_port_wait (port);write_lock_irq (&zfcp_data.config_lock);list_del (&port->list); port->adapter->ports--;write_unlock_irq (&zfcp_data.config_lock);if (port->rport) -fc_remote_port_delete (rport); +fc_remote_port_delete (port->rport); + port->rport =NULL ;zfcp_adapter_put (port->adapter);zfcp_sysfs_port_remove_files (&port->sysfs_device,atomic_read (&port->status));
drivers/s390/scsi/zfcp_ccw.c +1 -1
@@ -203,7 +203,7 @@ zfcp_ccw_set_offline(struct ccw_device * {struct zfcp_adapter *adapter;struct zfcp_port *port; -struct fc_port *rport; +struct fc_rport *rport;down (&zfcp_data.config_sema); adapter =dev_get_drvdata (&ccw_device->dev);
drivers/s390/scsi/zfcp_sysfs_port.c +0 -2
@@ -67,7 +67,6 @@ static DEVICE_ATTR(_name, S_IRUGO, zfcp_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 (scsi_id,"0x%x\n" , port->scsi_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
@@ -263,7 +262,6 @@ static struct attribute_group zfcp_port_static struct attribute *zfcp_port_no_ns_attrs[] = { &dev_attr_unit_add.attr, &dev_attr_unit_remove.attr, - &dev_attr_scsi_id.attr,NULL };