Revert "Merge branch 'bonding_monitor_locking'"
This reverts commit 4d961a101e032b4bf223b279b4b35bc77576f5a8, reversing
changes made to a00f6fcc7d0c62a91768d9c4ccba4c7d64fbbce3.
Revert bond locking changes, they cause regressions and Veaceslav Falico
doesn't like how the commit messages were done at all.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d6fe00b..187b1b7 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2068,10 +2068,8 @@
struct slave *slave;
struct port *port;
- if (!rtnl_trylock()) {
- queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
- return;
- }
+ read_lock(&bond->lock);
+
//check if there are any slaves
if (!bond_has_slaves(bond))
goto re_arm;
@@ -2124,8 +2122,9 @@
}
re_arm:
- rtnl_unlock();
queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
+
+ read_unlock(&bond->lock);
}
/**