bonding: handle slave's name change with primary_slave logic

Currently, if a slave's name change, we just pass it by. However, if the
slave is a current primary_slave, then we end up with using a slave, whose
name != params.primary, for primary_slave. And vice-versa, if we don't have
a primary_slave but have params.primary set - we will not detected a new
primary_slave.

Fix this by catching the NETDEV_CHANGENAME event and setting primary_slave
accordingly. Also, if the primary_slave was changed, issue a reselection of
the active slave, cause the priorities have changed.

Reported-by: Ding Tianhong <dingtianhong@huawei.com>
CC: Ding Tianhong <dingtianhong@huawei.com>
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Acked-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f2fe6cba384e88ee989c11a32ac20e03330d820b..f00dd45b0308d6f3035f7156076c2e7a17d13b11 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2860,9 +2860,27 @@ static int bond_slave_netdev_event(unsigned long event,
                 */
                break;
        case NETDEV_CHANGENAME:
-               /*
-                * TODO: handle changing the primary's name
-                */
+               /* we don't care if we don't have primary set */
+               if (!USES_PRIMARY(bond->params.mode) ||
+                   !bond->params.primary[0])
+                       break;
+
+               if (slave == bond->primary_slave) {
+                       /* slave's name changed - he's no longer primary */
+                       bond->primary_slave = NULL;
+               } else if (!strcmp(slave_dev->name, bond->params.primary)) {
+                       /* we have a new primary slave */
+                       bond->primary_slave = slave;
+               } else { /* we didn't change primary - exit */
+                       break;
+               }
+
+               pr_info("%s: Primary slave changed to %s, reselecting active slave.\n",
+                       bond->dev->name, bond->primary_slave ? slave_dev->name :
+                                                              "none");
+               write_lock_bh(&bond->curr_slave_lock);
+               bond_select_active_slave(bond);
+               write_unlock_bh(&bond->curr_slave_lock);
                break;
        case NETDEV_FEAT_CHANGE:
                bond_compute_features(bond);