浏览代码

[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: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Brian King 17 年之前
父节点
当前提交
49dd09613c
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/scsi/ipr.c

+ 1 - 1
drivers/scsi/ipr.c

@@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(struct device *dev,
 
 static struct device_attribute ipr_ioa_state_attr = {
 	.attr = {
-		.name =		"state",
+		.name =		"online_state",
 		.mode =		S_IRUGO | S_IWUSR,
 	},
 	.show = ipr_show_adapter_state,