[PATCH net-next 7/9] bonding: remove unwanted lock for bond_option_active_slave_set()
From: Ding Tianhong <hidden>
Date: 2013-11-06 06:54:35
Subsystem:
bonding driver, networking drivers, the rest · Maintainers:
Jay Vosburgh, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
The bond_option_active_slave_set() is always in RTNL, bond lock and curr_slave_lock is no longer need here, so remove it to clean the function. Signed-off-by: Ding Tianhong <redacted> --- drivers/net/bonding/bond_options.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 9a5223c..7694343 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c@@ -101,8 +101,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 */ if (!slave_dev) {
@@ -135,8 +133,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; }
--
1.8.2.1