Re: [PATCH 1/1] ipr: Rename ipr's state scsi host attribute to prevent collisions

[Badari Pulavarty <pbadari@us.ibm.com>]

On Mon, 2008-04-28 at 17:36 -0500, Brian King wrote:
> Due to recent SCSI core changes which add a scsi host attribute
> named "state", this now collides with an ipr driver scsi host attribute
> with the same name, preventing ipr from loading. Rename the ipr driver
> attribute to be more specific.
> 
> 
> Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
> ---
> 
>  linux-2.6-bjking1/drivers/scsi/ipr.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/scsi/ipr.c~ipr_host_state_rename drivers/scsi/ipr.c
> --- linux-2.6/drivers/scsi/ipr.c~ipr_host_state_rename	2008-04-28 17:30:54.000000000 -0500
> +++ linux-2.6-bjking1/drivers/scsi/ipr.c	2008-04-28 17:31:21.000000000 -0500
> @@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(s
> 
>  static struct device_attribute ipr_ioa_state_attr = {
>  	.attr = {
> -		.name =		"state",
> +		.name =		"online_state",
>  		.mode =		S_IRUGO | S_IWUSR,
>  	},
>  	.show = ipr_show_adapter_state,
> _

With this patch, I am able to boot 2.6.25-git12 on my ppc64 box.

Thanks,
Badari