[PATCH] scsi_transport_fc.c : .29 merge fix for FC passthru patch

[PATCH] scsi_transport_fc.c : .29 merge fix for FC passthru patch

[James Smart]

James,

It appears that the latest merge of scsi-misc-2.6 picked up a kernel change
that killed the bus_id element from struct device.

Here's a quick patch to resolve the inconsistency.  I assumed this was easier
than regen-ing the fc pass-thru patch.

This patch to be applied on top of the fc-pass-thru patch.

-- james s


 Signed-off-by: James Smart <james.smart@emulex.com>

 ---

 scsi_transport_fc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


diff -upNr a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
--- a/drivers/scsi/scsi_transport_fc.c	2009-04-07 13:38:38.000000000 -0400
+++ b/drivers/scsi/scsi_transport_fc.c	2009-04-07 13:39:18.000000000 -0400
@@ -3920,7 +3920,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost,
 	if (!q) {
 		printk(KERN_ERR "%s: bsg interface failed to "
 				"initialize - no request queue\n",
-				 dev->bus_id);
+				 dev->kobj.name);
 		return -ENOMEM;
 	}
 
@@ -3933,7 +3933,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost,
 	if (err) {
 		printk(KERN_ERR "%s: bsg interface failed to "
 				"initialize - register queue\n",
-				 dev->bus_id);
+				 dev->kobj.name);
 		blk_cleanup_queue(q);
 		return err;
 	}

Re: [PATCH] scsi_transport_fc.c : .29 merge fix for FC passthru patch

[James Bottomley]

On Tue, 2009-04-07 at 13:48 -0400, James Smart wrote:
> James,
> 
> It appears that the latest merge of scsi-misc-2.6 picked up a kernel change
> that killed the bus_id element from struct device.
> 
> Here's a quick patch to resolve the inconsistency.  I assumed this was easier
> than regen-ing the fc pass-thru patch.
> 
> This patch to be applied on top of the fc-pass-thru patch.
> 
> -- james s
> 
> 
>  Signed-off-by: James Smart <james.smart@emulex.com>
> 
>  ---
> 
>  scsi_transport_fc.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 
> diff -upNr a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
> --- a/drivers/scsi/scsi_transport_fc.c	2009-04-07 13:38:38.000000000 -0400
> +++ b/drivers/scsi/scsi_transport_fc.c	2009-04-07 13:39:18.000000000 -0400
> @@ -3920,7 +3920,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost,
>  	if (!q) {
>  		printk(KERN_ERR "%s: bsg interface failed to "
>  				"initialize - no request queue\n",
> -				 dev->bus_id);
> +				 dev->kobj.name);

This actually needs to be dev_name(dev), which is where all the bus_id
things went.

James