bonding: remove unwanted lock for bond_option_active_slave_set()

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

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2013-11-08 02:08 UTC #0 lore raw

PATCH v2 8/10 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.

Signed-off-by Ding Tianhong <[email protected]>

---
 drivers/net/bonding/bond_options.c | 2 --
 1 file changed, 2 deletions(-)

drivers/net/bonding/bond_options.c +0 -2

index 9a5223c..ae4cd04 100644
@@ -101,7 +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 */

@@ -136,7 +135,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