aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.c
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2014-09-11 16:49:25 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-13 16:29:07 -0400
commitb743562819bd97cc7c282e870896bae8016b64b5 (patch)
tree609840f05bf9dd7c1d6fec0c6e447e305bd866a7 /drivers/net/bonding/bond_3ad.c
parent1c72cfdc96e63bf975cab514c4ca4d8a661ba0e6 (diff)
bonding: convert curr_slave_lock to a spinlock and rename it
curr_slave_lock is now a misleading name, a much better name is mode_lock as it'll be used for each mode's purposes and it's no longer necessary to use a rwlock, a simple spinlock is enough. Suggested-by: Jay Vosburgh <jay.vosburgh@canonical.com> Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r--drivers/net/bonding/bond_3ad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index dfd3a7835d17..1824d1df4d09 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2057,7 +2057,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
2057 struct port *port; 2057 struct port *port;
2058 bool should_notify_rtnl = BOND_SLAVE_NOTIFY_LATER; 2058 bool should_notify_rtnl = BOND_SLAVE_NOTIFY_LATER;
2059 2059
2060 read_lock(&bond->curr_slave_lock); 2060 spin_lock_bh(&bond->mode_lock);
2061 rcu_read_lock(); 2061 rcu_read_lock();
2062 2062
2063 /* check if there are any slaves */ 2063 /* check if there are any slaves */
@@ -2120,7 +2120,7 @@ re_arm:
2120 } 2120 }
2121 } 2121 }
2122 rcu_read_unlock(); 2122 rcu_read_unlock();
2123 read_unlock(&bond->curr_slave_lock); 2123 spin_unlock_bh(&bond->mode_lock);
2124 2124
2125 if (should_notify_rtnl && rtnl_trylock()) { 2125 if (should_notify_rtnl && rtnl_trylock()) {
2126 bond_slave_state_notify(bond); 2126 bond_slave_state_notify(bond);