Commit 49dd0961 authored by Brian King's avatar Brian King Committed by James Bottomley

[SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions

Due to recent device model changes it now no longer tolerates name
collisions.  This causes a problem for ipr whose "state" attribute
collides with an identically named one in the SCSI mid-layer. Rename
the ipr driver attribute to be more specific.
Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 69cd39e9
...@@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(struct device *dev, ...@@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(struct device *dev,
static struct device_attribute ipr_ioa_state_attr = { static struct device_attribute ipr_ioa_state_attr = {
.attr = { .attr = {
.name = "state", .name = "online_state",
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
}, },
.show = ipr_show_adapter_state, .show = ipr_show_adapter_state,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment