diff options
author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2010-09-08 08:39:55 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-16 22:54:17 -0400 |
commit | b62a8d9b45b971a67a0f8413338c230e3117dff5 (patch) | |
tree | a38acd9f0fcb14e41e26503d8a25d8f1539dd27d /drivers/s390/scsi/zfcp_sysfs.c | |
parent | fdbd1c5e27dabfa950d4b0f52a20069aeaf67b9d (diff) |
[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>
Diffstat (limited to 'drivers/s390/scsi/zfcp_sysfs.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_sysfs.c | 66 |
1 files changed, 39 insertions, 27 deletions
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 6b43bc46bf97..4f59356b07bb 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c | |||
@@ -68,19 +68,19 @@ ZFCP_DEFINE_ATTR(zfcp_port, port, access_denied, "%d\n", | |||
68 | ZFCP_STATUS_COMMON_ACCESS_DENIED) != 0); | 68 | ZFCP_STATUS_COMMON_ACCESS_DENIED) != 0); |
69 | 69 | ||
70 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, status, "0x%08x\n", | 70 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, status, "0x%08x\n", |
71 | atomic_read(&unit->status)); | 71 | zfcp_unit_sdev_status(unit)); |
72 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, in_recovery, "%d\n", | 72 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, in_recovery, "%d\n", |
73 | (atomic_read(&unit->status) & | 73 | (zfcp_unit_sdev_status(unit) & |
74 | ZFCP_STATUS_COMMON_ERP_INUSE) != 0); | 74 | ZFCP_STATUS_COMMON_ERP_INUSE) != 0); |
75 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_denied, "%d\n", | 75 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_denied, "%d\n", |
76 | (atomic_read(&unit->status) & | 76 | (zfcp_unit_sdev_status(unit) & |
77 | ZFCP_STATUS_COMMON_ACCESS_DENIED) != 0); | 77 | ZFCP_STATUS_COMMON_ACCESS_DENIED) != 0); |
78 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_shared, "%d\n", | 78 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_shared, "%d\n", |
79 | (atomic_read(&unit->status) & | 79 | (zfcp_unit_sdev_status(unit) & |
80 | ZFCP_STATUS_UNIT_SHARED) != 0); | 80 | ZFCP_STATUS_LUN_SHARED) != 0); |
81 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_readonly, "%d\n", | 81 | ZFCP_DEFINE_ATTR(zfcp_unit, unit, access_readonly, "%d\n", |
82 | (atomic_read(&unit->status) & | 82 | (zfcp_unit_sdev_status(unit) & |
83 | ZFCP_STATUS_UNIT_READONLY) != 0); | 83 | ZFCP_STATUS_LUN_READONLY) != 0); |
84 | 84 | ||
85 | static ssize_t zfcp_sysfs_port_failed_show(struct device *dev, | 85 | static ssize_t zfcp_sysfs_port_failed_show(struct device *dev, |
86 | struct device_attribute *attr, | 86 | struct device_attribute *attr, |
@@ -121,11 +121,17 @@ static ssize_t zfcp_sysfs_unit_failed_show(struct device *dev, | |||
121 | char *buf) | 121 | char *buf) |
122 | { | 122 | { |
123 | struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev); | 123 | struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev); |
124 | struct scsi_device *sdev; | ||
125 | unsigned int status, failed = 1; | ||
126 | |||
127 | sdev = zfcp_unit_sdev(unit); | ||
128 | if (sdev) { | ||
129 | status = atomic_read(&sdev_to_zfcp(sdev)->status); | ||
130 | failed = status & ZFCP_STATUS_COMMON_ERP_FAILED ? 1 : 0; | ||
131 | scsi_device_put(sdev); | ||
132 | } | ||
124 | 133 | ||
125 | if (atomic_read(&unit->status) & ZFCP_STATUS_COMMON_ERP_FAILED) | 134 | return sprintf(buf, "%d\n", failed); |
126 | return sprintf(buf, "1\n"); | ||
127 | |||
128 | return sprintf(buf, "0\n"); | ||
129 | } | 135 | } |
130 | 136 | ||
131 | static ssize_t zfcp_sysfs_unit_failed_store(struct device *dev, | 137 | static ssize_t zfcp_sysfs_unit_failed_store(struct device *dev, |
@@ -134,15 +140,21 @@ static ssize_t zfcp_sysfs_unit_failed_store(struct device *dev, | |||
134 | { | 140 | { |
135 | struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev); | 141 | struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev); |
136 | unsigned long val; | 142 | unsigned long val; |
143 | struct scsi_device *sdev; | ||
137 | 144 | ||
138 | if (strict_strtoul(buf, 0, &val) || val != 0) | 145 | if (strict_strtoul(buf, 0, &val) || val != 0) |
139 | return -EINVAL; | 146 | return -EINVAL; |
140 | 147 | ||
141 | zfcp_erp_modify_unit_status(unit, "syufai1", NULL, | 148 | sdev = zfcp_unit_sdev(unit); |
142 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); | 149 | if (sdev) { |
143 | zfcp_erp_unit_reopen(unit, ZFCP_STATUS_COMMON_ERP_FAILED, | 150 | zfcp_erp_modify_lun_status(sdev, "syufai1", NULL, |
144 | "syufai2", NULL); | 151 | ZFCP_STATUS_COMMON_RUNNING, |
145 | zfcp_erp_wait(unit->port->adapter); | 152 | ZFCP_SET); |
153 | zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED, | ||
154 | "syufai2", NULL); | ||
155 | zfcp_erp_wait(unit->port->adapter); | ||
156 | } else | ||
157 | zfcp_unit_scsi_scan(unit); | ||
146 | 158 | ||
147 | return count; | 159 | return count; |
148 | } | 160 | } |
@@ -347,9 +359,9 @@ zfcp_sysfs_unit_##_name##_latency_show(struct device *dev, \ | |||
347 | struct device_attribute *attr, \ | 359 | struct device_attribute *attr, \ |
348 | char *buf) { \ | 360 | char *buf) { \ |
349 | struct scsi_device *sdev = to_scsi_device(dev); \ | 361 | struct scsi_device *sdev = to_scsi_device(dev); \ |
350 | struct zfcp_unit *unit = sdev->hostdata; \ | 362 | struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); \ |
351 | struct zfcp_latencies *lat = &unit->latencies; \ | 363 | struct zfcp_latencies *lat = &zfcp_sdev->latencies; \ |
352 | struct zfcp_adapter *adapter = unit->port->adapter; \ | 364 | struct zfcp_adapter *adapter = zfcp_sdev->port->adapter; \ |
353 | unsigned long long fsum, fmin, fmax, csum, cmin, cmax, cc; \ | 365 | unsigned long long fsum, fmin, fmax, csum, cmin, cmax, cc; \ |
354 | \ | 366 | \ |
355 | spin_lock_bh(&lat->lock); \ | 367 | spin_lock_bh(&lat->lock); \ |
@@ -378,8 +390,8 @@ zfcp_sysfs_unit_##_name##_latency_store(struct device *dev, \ | |||
378 | const char *buf, size_t count) \ | 390 | const char *buf, size_t count) \ |
379 | { \ | 391 | { \ |
380 | struct scsi_device *sdev = to_scsi_device(dev); \ | 392 | struct scsi_device *sdev = to_scsi_device(dev); \ |
381 | struct zfcp_unit *unit = sdev->hostdata; \ | 393 | struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); \ |
382 | struct zfcp_latencies *lat = &unit->latencies; \ | 394 | struct zfcp_latencies *lat = &zfcp_sdev->latencies; \ |
383 | unsigned long flags; \ | 395 | unsigned long flags; \ |
384 | \ | 396 | \ |
385 | spin_lock_irqsave(&lat->lock, flags); \ | 397 | spin_lock_irqsave(&lat->lock, flags); \ |
@@ -407,26 +419,26 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \ | |||
407 | struct device_attribute *attr,\ | 419 | struct device_attribute *attr,\ |
408 | char *buf) \ | 420 | char *buf) \ |
409 | { \ | 421 | { \ |
410 | struct scsi_device *sdev = to_scsi_device(dev); \ | 422 | struct scsi_device *sdev = to_scsi_device(dev); \ |
411 | struct zfcp_unit *unit = sdev->hostdata; \ | 423 | struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); \ |
424 | struct zfcp_port *port = zfcp_sdev->port; \ | ||
412 | \ | 425 | \ |
413 | return sprintf(buf, _format, _value); \ | 426 | return sprintf(buf, _format, _value); \ |
414 | } \ | 427 | } \ |
415 | static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL); | 428 | static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL); |
416 | 429 | ||
417 | ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n", | 430 | ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n", |
418 | dev_name(&unit->port->adapter->ccw_device->dev)); | 431 | dev_name(&port->adapter->ccw_device->dev)); |
419 | ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", | 432 | ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", |
420 | (unsigned long long) unit->port->wwpn); | 433 | (unsigned long long) port->wwpn); |
421 | 434 | ||
422 | static ssize_t zfcp_sysfs_scsi_fcp_lun_show(struct device *dev, | 435 | static ssize_t zfcp_sysfs_scsi_fcp_lun_show(struct device *dev, |
423 | struct device_attribute *attr, | 436 | struct device_attribute *attr, |
424 | char *buf) | 437 | char *buf) |
425 | { | 438 | { |
426 | struct scsi_device *sdev = to_scsi_device(dev); | 439 | struct scsi_device *sdev = to_scsi_device(dev); |
427 | struct zfcp_unit *unit = sdev->hostdata; | ||
428 | 440 | ||
429 | return sprintf(buf, "0x%016llx\n", (unsigned long long) unit->fcp_lun); | 441 | return sprintf(buf, "0x%016llx\n", zfcp_scsi_dev_lun(sdev)); |
430 | } | 442 | } |
431 | static DEVICE_ATTR(fcp_lun, S_IRUGO, zfcp_sysfs_scsi_fcp_lun_show, NULL); | 443 | static DEVICE_ATTR(fcp_lun, S_IRUGO, zfcp_sysfs_scsi_fcp_lun_show, NULL); |
432 | 444 | ||