diff options
| author | dingtianhong | 2013-12-13 03:20:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-12-14 07:58:02 +0100 |
| commit | 4e789fc1a62d4c25726ee053044399d71471fe2f (patch) | |
| tree | 3e9a900b6a809ad87bed2ed31bb0d90606b8235d /drivers/net/bonding | |
| parent | bonding: add RCU for bond_3ad_state_machine_handler() (diff) | |
| download | kernel-qcow2-linux-4e789fc1a62d4c25726ee053044399d71471fe2f.tar.gz kernel-qcow2-linux-4e789fc1a62d4c25726ee053044399d71471fe2f.tar.xz kernel-qcow2-linux-4e789fc1a62d4c25726ee053044399d71471fe2f.zip | |
bonding: remove unwanted lock for bond_option_active_slave_set()
The bond_option_active_slave_set() is always called in RTNL,
the RTNL could protect bond slave list, so remove the unwanted
bond lock.
Suggested-by: Jay Vosburgh <fubar@us.ibm.com>
Suggested-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_options.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index dfef673d53d1..600779e5904f 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -107,7 +107,6 @@ int bond_option_active_slave_set(struct bonding *bond, } block_netpoll_tx(); - read_lock(&bond->lock); write_lock_bh(&bond->curr_slave_lock); /* check to see if we are clearing active */ @@ -142,7 +141,6 @@ int bond_option_active_slave_set(struct bonding *bond, } write_unlock_bh(&bond->curr_slave_lock); - read_unlock(&bond->lock); unblock_netpoll_tx(); return ret; } |