aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordingtianhong <dingtianhong@huawei.com>2013-12-12 21:20:17 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-14 01:58:02 -0500
commit4e789fc1a62d4c25726ee053044399d71471fe2f (patch)
tree3e9a900b6a809ad87bed2ed31bb0d90606b8235d
parentbe79bd048abe9fb6aee049ea903d1e70b44d6480 (diff)
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>
-rw-r--r--drivers/net/bonding/bond_options.c2
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,
107 } 107 }
108 108
109 block_netpoll_tx(); 109 block_netpoll_tx();
110 read_lock(&bond->lock);
111 write_lock_bh(&bond->curr_slave_lock); 110 write_lock_bh(&bond->curr_slave_lock);
112 111
113 /* check to see if we are clearing active */ 112 /* check to see if we are clearing active */
@@ -142,7 +141,6 @@ int bond_option_active_slave_set(struct bonding *bond,
142 } 141 }
143 142
144 write_unlock_bh(&bond->curr_slave_lock); 143 write_unlock_bh(&bond->curr_slave_lock);
145 read_unlock(&bond->lock);
146 unblock_netpoll_tx(); 144 unblock_netpoll_tx();
147 return ret; 145 return ret;
148} 146}