Commit 6702ca1d authored by Nithin Sujir's avatar Nithin Sujir Committed by James Bottomley

[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.htmlSigned-off-by: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 839900c6
...@@ -1432,8 +1432,7 @@ static int bnx2fc_destroy(struct net_device *netdev) ...@@ -1432,8 +1432,7 @@ static int bnx2fc_destroy(struct net_device *netdev)
struct net_device *phys_dev; struct net_device *phys_dev;
int rc = 0; int rc = 0;
if (!rtnl_trylock()) rtnl_lock();
return restart_syscall();
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE #ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE
...@@ -1805,10 +1804,7 @@ static int bnx2fc_disable(struct net_device *netdev) ...@@ -1805,10 +1804,7 @@ static int bnx2fc_disable(struct net_device *netdev)
struct ethtool_drvinfo drvinfo; struct ethtool_drvinfo drvinfo;
int rc = 0; int rc = 0;
if (!rtnl_trylock()) { rtnl_lock();
printk(KERN_ERR PFX "retrying for rtnl_lock\n");
return -EIO;
}
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
...@@ -1867,10 +1863,7 @@ static int bnx2fc_enable(struct net_device *netdev) ...@@ -1867,10 +1863,7 @@ static int bnx2fc_enable(struct net_device *netdev)
struct ethtool_drvinfo drvinfo; struct ethtool_drvinfo drvinfo;
int rc = 0; int rc = 0;
if (!rtnl_trylock()) { rtnl_lock();
printk(KERN_ERR PFX "retrying for rtnl_lock\n");
return -EIO;
}
BNX2FC_MISC_DBG("Entered %s\n", __func__); BNX2FC_MISC_DBG("Entered %s\n", __func__);
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
...@@ -1942,10 +1935,8 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode) ...@@ -1942,10 +1935,8 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
return -EIO; return -EIO;
} }
if (!rtnl_trylock()) { rtnl_lock();
printk(KERN_ERR "trying for rtnl_lock\n");
return -EIO;
}
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE #ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment