diff options
| author | Bhanu Prakash Gollapudi <bprakash@broadcom.com> | 2011-08-30 15:54:51 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-09-17 18:04:25 +0400 |
| commit | 0cbf32e1681d870632a1772601cbaadd996dc978 (patch) | |
| tree | 80c3b6cc94c1b990e4f27620e006739b21475936 /drivers/scsi/bnx2fc | |
| parent | 26b2982f78c1fc6f486a67271b1d0a0d305dd54b (diff) | |
| download | linux-0cbf32e1681d870632a1772601cbaadd996dc978.tar.gz linux-0cbf32e1681d870632a1772601cbaadd996dc978.tar.bz2 linux-0cbf32e1681d870632a1772601cbaadd996dc978.zip | |
[SCSI] bnx2fc: Avoid calling bnx2fc_if_destroy with unnecessary locks
It is not required to hold rtnl_lock and bnx2fc_dev_lock when calling
bnx2fc_if_destroy, as the locking is only required to serialize creation and
deletion of fcoe instances. More importantly, this unnecessary locking causes
deadlock as bnx2fc_if_destroy calls fc_remove_host holding rtnl_lock.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/bnx2fc')
| -rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 886938d025cd..a5111f365f69 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -1487,13 +1487,13 @@ static void bnx2fc_if_destroy(struct fc_lport *lport) static void __bnx2fc_destroy(struct bnx2fc_interface *interface) { struct fc_lport *lport = interface->ctlr.lp; + struct fcoe_port *port = lport_priv(lport); bnx2fc_interface_cleanup(interface); bnx2fc_stop(interface); list_del(&interface->list); - lport = interface->ctlr.lp; bnx2fc_interface_put(interface); - bnx2fc_if_destroy(lport); + queue_work(bnx2fc_wq, &port->destroy_work); } /** @@ -1541,11 +1541,7 @@ static void bnx2fc_destroy_work(struct work_struct *work) BNX2FC_HBA_DBG(lport, "Entered bnx2fc_destroy_work\n"); - rtnl_lock(); - mutex_lock(&bnx2fc_dev_lock); bnx2fc_if_destroy(lport); - mutex_unlock(&bnx2fc_dev_lock); - rtnl_unlock(); } static void bnx2fc_unbind_adapter_devices(struct bnx2fc_hba *hba) |