Skip to contentSkip to conversation

scsi_transport_fc.c : .29 merge fix for FC passthru patch

PATCH In review James Smart 2 participants 2 messages Apr 7, 2009 SCSI

lore
Share & tools
lore

James Smart

author
#0 lore raw

PATCH 1/1 scsi_transport_fc.c : .29 merge fix for FC passthru patch

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 <[email protected]>

---

 scsi_transport_fc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/scsi_transport_fc.c +2 -2
diff -upNr a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
@@ -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;
 	}
maintainer
#1 lore raw
Quoted 25 lines · 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 <[email protected]>

---

 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

drivers/scsi/scsi_transport_fc.c fc_bsg_rportadd(struct Scsi_Host *shost, · line 3923

Quoted 5 lines
drivers/scsi/scsi_transport_fc.c +1 -1
@@ -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