diff options
| author | Robert Love <robert.w.love@intel.com> | 2009-02-27 10:56:06 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-03-10 09:06:17 -0500 |
| commit | 03ec862dff57ca3d1fcb439b99aadc45bc5c2f28 (patch) | |
| tree | da35accd2d35568a041d0efa77deb306a206c962 /drivers/scsi | |
| parent | a468f328ad83f14556e5961ef1de80b32b428d32 (diff) | |
| download | kernel-crypto-03ec862dff57ca3d1fcb439b99aadc45bc5c2f28.tar.gz kernel-crypto-03ec862dff57ca3d1fcb439b99aadc45bc5c2f28.tar.xz kernel-crypto-03ec862dff57ca3d1fcb439b99aadc45bc5c2f28.zip | |
[SCSI] fcoe: Correct fcoe_transports initialization vs. registration
The registration function shouldn't initialize the mutex or
list head. The fcoe SW transport should initialize itself
before registering.
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/fcoe/fc_transport_fcoe.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/fcoe/fcoe_sw.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/fcoe/fc_transport_fcoe.c b/drivers/scsi/fcoe/fc_transport_fcoe.c index 847453a70c6..8862758006c 100644 --- a/drivers/scsi/fcoe/fc_transport_fcoe.c +++ b/drivers/scsi/fcoe/fc_transport_fcoe.c @@ -258,9 +258,6 @@ int fcoe_transport_register(struct fcoe_transport *t) list_add_tail(&t->list, &fcoe_transports); mutex_unlock(&fcoe_transports_lock); - mutex_init(&t->devlock); - INIT_LIST_HEAD(&t->devlist); - printk(KERN_DEBUG "fcoe_transport_register:%s\n", t->name); return 0; diff --git a/drivers/scsi/fcoe/fcoe_sw.c b/drivers/scsi/fcoe/fcoe_sw.c index f667dce1bbb..37d359db164 100644 --- a/drivers/scsi/fcoe/fcoe_sw.c +++ b/drivers/scsi/fcoe/fcoe_sw.c @@ -467,10 +467,15 @@ int __init fcoe_sw_init(void) /* attach to scsi transport */ scsi_transport_fcoe_sw = fc_attach_transport(&fcoe_sw_transport_function); + if (!scsi_transport_fcoe_sw) { printk(KERN_ERR "fcoe_sw_init:fc_attach_transport() failed\n"); return -ENODEV; } + + mutex_init(&fcoe_sw_transport.devlock); + INIT_LIST_HEAD(&fcoe_sw_transport.devlist); + /* register sw transport */ fcoe_transport_register(&fcoe_sw_transport); return 0; |