Skip to content

Commit

Permalink
[SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required a…
Browse files Browse the repository at this point in the history 
…nymore

The flag ZFCP_STATUS_COMMON_REMOVE was used to indicate that a
resource is not ready to be used or about to be removed from the
system. This is now better done by an improved list handling
and therefore the additional indicator is not required anymore.

Signed-off-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>
  • Loading branch information
Swen Schillig authored and James Bottomley committed Dec 4, 2009
1 parent c1fad41 commit 6b18333
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 78 deletions.
27 changes: 7 additions & 20 deletions drivers/s390/scsi/zfcp_aux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)

read_lock_irqsave(&port->unit_list_lock, flags);
list_for_each_entry(unit, &port->unit_list, list)
if ((unit->fcp_lun == fcp_lun) &&
!(atomic_read(&unit->status) & ZFCP_STATUS_COMMON_REMOVE)) {
get_device(&unit->sysfs_device);
if (unit->fcp_lun == fcp_lun) {
if (!get_device(&unit->sysfs_device))
unit = NULL;
read_unlock_irqrestore(&port->unit_list_lock, flags);
return unit;
}
Expand All @@ -270,9 +270,9 @@ struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter,

read_lock_irqsave(&adapter->port_list_lock, flags);
list_for_each_entry(port, &adapter->port_list, list)
if ((port->wwpn == wwpn) &&
!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_REMOVE)) {
get_device(&port->sysfs_device);
if (port->wwpn == wwpn) {
if (!get_device(&port->sysfs_device))
port = NULL;
read_unlock_irqrestore(&adapter->port_list_lock, flags);
return port;
}
Expand Down Expand Up @@ -334,9 +334,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)
}
retval = -EINVAL;

/* mark unit unusable as long as sysfs registration is not complete */
atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);

INIT_WORK(&unit->scsi_work, zfcp_scsi_scan);

spin_lock_init(&unit->latencies.lock);
Expand All @@ -360,7 +357,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)
list_add_tail(&unit->list, &port->unit_list);
write_unlock_irq(&port->unit_list_lock);

atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);
atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status);

return unit;
Expand Down Expand Up @@ -565,17 +561,12 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device)

adapter->service_level.seq_print = zfcp_print_sl;

/* mark adapter unusable as long as sysfs registration is not complete */
atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);

dev_set_drvdata(&ccw_device->dev, adapter);

if (sysfs_create_group(&ccw_device->dev.kobj,
&zfcp_sysfs_adapter_attrs))
goto failed;

atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);

if (!zfcp_adapter_scsi_register(adapter))
return adapter;

Expand Down Expand Up @@ -692,9 +683,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
port->sysfs_device.parent = &adapter->ccw_device->dev;
port->sysfs_device.release = zfcp_port_release;

/* mark port unusable as long as sysfs registration is not complete */
atomic_set_mask(status | ZFCP_STATUS_COMMON_REMOVE, &port->status);

if (dev_set_name(&port->sysfs_device, "0x%016llx",
(unsigned long long)wwpn)) {
kfree(port);
Expand All @@ -715,8 +703,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
list_add_tail(&port->list, &adapter->port_list);
write_unlock_irq(&adapter->port_list_lock);

atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &port->status);
atomic_set_mask(status | ZFCP_STATUS_COMMON_RUNNING, &port->status);

return port;

Expand Down
7 changes: 1 addition & 6 deletions drivers/s390/scsi/zfcp_ccw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,11 @@ static void zfcp_ccw_remove(struct ccw_device *cdev)
write_lock_irq(&adapter->port_list_lock);
list_for_each_entry_safe(port, p, &adapter->port_list, list) {
write_lock(&port->unit_list_lock);
list_for_each_entry_safe(unit, u, &port->unit_list, list) {
atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE,
&unit->status);
list_for_each_entry_safe(unit, u, &port->unit_list, list)
list_move(&unit->list, &unit_remove_lh);
}
write_unlock(&port->unit_list_lock);
atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
list_move(&port->list, &port_remove_lh);
}
atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);
write_unlock_irq(&adapter->port_list_lock);
zfcp_ccw_adapter_put(adapter); /* put from zfcp_ccw_adapter_by_cdev */

Expand Down
1 change: 0 additions & 1 deletion drivers/s390/scsi/zfcp_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ struct zfcp_ls_adisc {
#define ZFCP_COMMON_FLAGS 0xfff00000

/* common status bits */
#define ZFCP_STATUS_COMMON_REMOVE 0x80000000
#define ZFCP_STATUS_COMMON_RUNNING 0x40000000
#define ZFCP_STATUS_COMMON_ERP_FAILED 0x20000000
#define ZFCP_STATUS_COMMON_UNBLOCKED 0x10000000
Expand Down
6 changes: 4 additions & 2 deletions drivers/s390/scsi/zfcp_erp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need,

switch (need) {
case ZFCP_ERP_ACTION_REOPEN_UNIT:
get_device(&unit->sysfs_device);
if (!get_device(&unit->sysfs_device))
return NULL;
atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &unit->status);
erp_action = &unit->erp_action;
if (!(atomic_read(&unit->status) & ZFCP_STATUS_COMMON_RUNNING))
Expand All @@ -183,7 +184,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need,

case ZFCP_ERP_ACTION_REOPEN_PORT:
case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
get_device(&port->sysfs_device);
if (!get_device(&port->sysfs_device))
return NULL;
zfcp_erp_action_dismiss_port(port);
atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status);
erp_action = &port->erp_action;
Expand Down
1 change: 0 additions & 1 deletion drivers/s390/scsi/zfcp_fc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,6 @@ static void zfcp_fc_validate_port(struct zfcp_port *port, struct list_head *lh)
!list_empty(&port->unit_list))
return;

atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
list_move_tail(&port->list, lh);
}

Expand Down
70 changes: 22 additions & 48 deletions drivers/s390/scsi/zfcp_sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,8 @@ static ssize_t zfcp_sysfs_##_feat##_failed_store(struct device *dev, \
unsigned long val; \
int retval = 0; \
\
if (atomic_read(&_feat->status) & ZFCP_STATUS_COMMON_REMOVE) { \
retval = -EBUSY; \
goto out; \
} \
if (!(_feat && get_device(&_feat->sysfs_device))) \
return -EBUSY; \
\
if (strict_strtoul(buf, 0, &val) || val != 0) { \
retval = -EINVAL; \
Expand All @@ -120,6 +118,7 @@ static ssize_t zfcp_sysfs_##_feat##_failed_store(struct device *dev, \
_reopen_id, NULL); \
zfcp_erp_wait(_adapter); \
out: \
put_device(&_feat->sysfs_device); \
return retval ? retval : (ssize_t) count; \
} \
static ZFCP_DEV_ATTR(_feat, failed, S_IWUSR | S_IRUGO, \
Expand Down Expand Up @@ -161,11 +160,6 @@ static ssize_t zfcp_sysfs_adapter_failed_store(struct device *dev,
if (!adapter)
return -ENODEV;

if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_REMOVE) {
retval = -EBUSY;
goto out;
}

if (strict_strtoul(buf, 0, &val) || val != 0) {
retval = -EINVAL;
goto out;
Expand Down Expand Up @@ -195,14 +189,9 @@ static ssize_t zfcp_sysfs_port_rescan_store(struct device *dev,
if (!adapter)
return -ENODEV;

if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_REMOVE) {
ret = -EBUSY;
goto out;
}

ret = zfcp_fc_scan_ports(adapter);
out:
zfcp_ccw_adapter_put(adapter);

return ret ? ret : (ssize_t) count;
}
static ZFCP_DEV_ATTR(adapter, port_rescan, S_IWUSR, NULL,
Expand All @@ -216,28 +205,19 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev);
struct zfcp_port *port;
u64 wwpn;
int retval = 0;
int retval = -EINVAL;

if (!adapter)
return -ENODEV;

if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_REMOVE) {
retval = -EBUSY;
if (strict_strtoull(buf, 0, (unsigned long long *) &wwpn))
goto out;
}

if (strict_strtoull(buf, 0, (unsigned long long *) &wwpn)) {
retval = -EINVAL;
goto out;
}

port = zfcp_get_port_by_wwpn(adapter, wwpn);
if (!port) {
retval = -ENXIO;
if (!port)
goto out;
}

atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);
else
retval = 0;

write_lock_irq(&adapter->port_list_lock);
list_del(&port->list);
Expand Down Expand Up @@ -283,24 +263,23 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
u64 fcp_lun;
int retval = -EINVAL;

if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_REMOVE) {
retval = -EBUSY;
goto out;
}
if (!(port && get_device(&port->sysfs_device)))
return -EBUSY;

if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
goto out;

unit = zfcp_unit_enqueue(port, fcp_lun);
if (IS_ERR(unit))
goto out;

retval = 0;
else
retval = 0;

zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL);
zfcp_erp_wait(unit->port->adapter);
flush_work(&unit->scsi_work);
out:
put_device(&port->sysfs_device);
return retval ? retval : (ssize_t) count;
}
static DEVICE_ATTR(unit_add, S_IWUSR, NULL, zfcp_sysfs_unit_add_store);
Expand All @@ -313,29 +292,23 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
sysfs_device);
struct zfcp_unit *unit;
u64 fcp_lun;
int retval = 0;
int retval = -EINVAL;

if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_REMOVE) {
retval = -EBUSY;
goto out;
}
if (!(port && get_device(&port->sysfs_device)))
return -EBUSY;

if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun)) {
retval = -EINVAL;
if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
goto out;
}

unit = zfcp_get_unit_by_lun(port, fcp_lun);
if (!unit) {
retval = -EINVAL;
if (!unit)
goto out;
}
else
retval = 0;

/* wait for possible timeout during SCSI probe */
flush_work(&unit->scsi_work);

atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);

write_lock_irq(&port->unit_list_lock);
list_del(&unit->list);
write_unlock_irq(&port->unit_list_lock);
Expand All @@ -345,6 +318,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
zfcp_erp_unit_shutdown(unit, 0, "syurs_1", NULL);
zfcp_device_unregister(&unit->sysfs_device, &zfcp_sysfs_unit_attrs);
out:
put_device(&port->sysfs_device);
return retval ? retval : (ssize_t) count;
}
static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);
Expand Down

0 comments on commit 6b18333

Please sign in to comment.