Skip to contentSkip to conversation

bonding: remove unwanted lock for bond_option_active_slave_set()

PATCH Superseded Ding Tianhong 1 participant 1 message Nov 6, 2013

Subsystems (3)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 7/9 bonding: remove unwanted lock for bond_option_active_slave_set()

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.

---
 drivers/net/bonding/bond_options.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/net/bonding/bond_options.c +0 -4
index 9a5223c..7694343 100644
@@ -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;
 }
Signature · 1 line
1.8.2.1