Skip to content

Commit

Permalink
[SCSI] bnx2fc: Remove rtnl_trylock/restart_syscall checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nithin Sujir authored and James Bottomley committed Mar 23, 2011
1 parent 839900c commit 6702ca1
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6702ca1

Please sign in to comment.