diff options
author | dingtianhong <dingtianhong@huawei.com> | 2014-02-10 03:33:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-10 19:54:29 -0500 |
commit | 6b8790b5006b5ca3ee1c039c3c909833d7958716 (patch) | |
tree | 8604c7edd2a28c6ecc50e31a26932413823d9016 /drivers/net/bonding | |
parent | 19a38d8e0aa33b4f4d11d3b4baa902ad169daa80 (diff) |
bonding: remove unwanted bond lock for enslave processing
The bond enslave processing don't hold bond->lock anymore,
so release an unlocked rw lock will cause warning message,
remove the unwanted read_unlock(&bond->lock).
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Veaceslav Falico <vfalico@redhat.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Acked-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 35f7e90aef72..71ba18efa15b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1510,7 +1510,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) | |||
1510 | slave_dev->npinfo = bond->dev->npinfo; | 1510 | slave_dev->npinfo = bond->dev->npinfo; |
1511 | if (slave_dev->npinfo) { | 1511 | if (slave_dev->npinfo) { |
1512 | if (slave_enable_netpoll(new_slave)) { | 1512 | if (slave_enable_netpoll(new_slave)) { |
1513 | read_unlock(&bond->lock); | ||
1514 | pr_info("Error, %s: master_dev is using netpoll, " | 1513 | pr_info("Error, %s: master_dev is using netpoll, " |
1515 | "but new slave device does not support netpoll.\n", | 1514 | "but new slave device does not support netpoll.\n", |
1516 | bond_dev->name); | 1515 | bond_dev->name); |