bonding: clean curr_slave_lock use

Mostly all users of curr_slave_lock already have RTNL as we've discussed
previously so there's no point in using it, the one case where the lock
must stay is the 3ad code, in fact it's the only one.
It's okay to remove it from bond_do_fail_over_mac() as it's called with
RTNL and drops the curr_slave_lock anyway.
bond_change_active_slave() is one of the main places where
curr_slave_lock was used, it's okay to remove it as all callers use RTNL
these days before calling it, that's why we move the ASSERT_RTNL() in
the beginning to catch any potential offenders to this rule.
The RTNL argument actually applies to all of the places where
curr_slave_lock has been removed from in this patch.
Also remove the unnecessary bond_deref_active_protected() macro and use
rtnl_dereference() instead.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 534c0600484e..b62697f4a3de 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -734,15 +734,13 @@ static int bond_option_active_slave_set(struct bonding *bond,
         }
 
         block_netpoll_tx();
-        write_lock_bh(&bond->curr_slave_lock);
-
         /* check to see if we are clearing active */
         if (!slave_dev) {
                 netdev_info(bond->dev, "Clearing current active slave\n");
                 RCU_INIT_POINTER(bond->curr_active_slave, NULL);
                 bond_select_active_slave(bond);
         } else {
-                struct slave *old_active = bond_deref_active_protected(bond);
+                struct slave *old_active = rtnl_dereference(bond->curr_active_slave);
                 struct slave *new_active = bond_slave_get_rtnl(slave_dev);
 
                 BUG_ON(!new_active);
@@ -765,8 +763,6 @@ static int bond_option_active_slave_set(struct bonding *bond,
                         }
                 }
         }
-
-        write_unlock_bh(&bond->curr_slave_lock);
         unblock_netpoll_tx();
 
         return ret;
@@ -1066,7 +1062,6 @@ static int bond_option_primary_set(struct bonding *bond,
         struct slave *slave;
 
         block_netpoll_tx();
-        write_lock_bh(&bond->curr_slave_lock);
 
         p = strchr(primary, '\n');
         if (p)
@@ -1103,7 +1098,6 @@ static int bond_option_primary_set(struct bonding *bond,
                     primary, bond->dev->name);
 
 out:
-        write_unlock_bh(&bond->curr_slave_lock);
         unblock_netpoll_tx();
 
         return 0;
@@ -1117,9 +1111,7 @@ static int bond_option_primary_reselect_set(struct bonding *bond,
         bond->params.primary_reselect = newval->value;
 
         block_netpoll_tx();
-        write_lock_bh(&bond->curr_slave_lock);
         bond_select_active_slave(bond);
-        write_unlock_bh(&bond->curr_slave_lock);
         unblock_netpoll_tx();
 
         return 0;