dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[SCSI] bnx2fc: Remove rtnl_trylock/restart_syscall checks 

Call rtnl_lock instead of rtnl_trylock & restart_syscall. This is bnx2fc
counterpart of fcoe fixes, here is the reference:
https://lists.open-fcoe.org/pipermail/devel/2011-March/011199.html

Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Nithin Sujir 2011-03-17 17:13:27 -07:00 committed by James Bottomley
parent 839900c69d
commit 6702ca1dff
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -1432,8 +1432,7 @@ static int bnx2fc_destroy(struct net_device *netdev)
struct net_device *phys_dev;
int rc = 0;
if (!rtnl_trylock())
return restart_syscall();
rtnl_lock();
mutex_lock(&bnx2fc_dev_lock);
#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE
@ -1805,10 +1804,7 @@ static int bnx2fc_disable(struct net_device *netdev)
struct ethtool_drvinfo drvinfo;
int rc = 0;
if (!rtnl_trylock()) {
printk(KERN_ERR PFX "retrying for rtnl_lock\n");
return -EIO;
}
rtnl_lock();
mutex_lock(&bnx2fc_dev_lock);
@ -1867,10 +1863,7 @@ static int bnx2fc_enable(struct net_device *netdev)
struct ethtool_drvinfo drvinfo;
int rc = 0;
if (!rtnl_trylock()) {
printk(KERN_ERR PFX "retrying for rtnl_lock\n");
return -EIO;
}
rtnl_lock();
BNX2FC_MISC_DBG("Entered %s\n", __func__);
mutex_lock(&bnx2fc_dev_lock);
@ -1942,10 +1935,8 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
return -EIO;
}
if (!rtnl_trylock()) {
printk(KERN_ERR "trying for rtnl_lock\n");
return -EIO;
}
rtnl_lock();
mutex_lock(&bnx2fc_dev_lock);
#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE