]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
bonding: deliver netdev event for fail-over under the active-backup mode
authorOr Gerlitz <ogerlitz@voltaire.com>
Sat, 14 Jun 2008 01:12:02 +0000 (18:12 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 18 Jun 2008 03:59:42 +0000 (23:59 -0400)
under active-backup mode and when there's actual new_active slave,
have bond_change_active_slave() call the networking core to deliver
NETDEV_BONDING_FAILOVER event such that the fail-over can be notable
by code outside of the bonding driver such as the RDMA stack and
monitoring tools.

As the correct context of locking appropriate for notifier calls is RTNL
and nothing else, bond->curr_slave_lock and bond->lock are unlocked and
later locked again. This is ensured by the rest of the code to be safe
under backup-mode AND when new_active is not NULL.

Jay Vosburgh modified the original patch for formatting and fixed a
compiler error.

Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/bonding/bond_main.c

index 2db2d057ccd069e6ca47baaf90ccdb28e6994bde..925402bcdf4d4a0432d939917fdee3b43890ca41 100644 (file)
@@ -1203,6 +1203,14 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
                                dprintk("delaying gratuitous arp on %s\n",
                                        bond->curr_active_slave->dev->name);
                        }
+
+                       write_unlock_bh(&bond->curr_slave_lock);
+                       read_unlock(&bond->lock);
+
+                       netdev_bonding_change(bond->dev);
+
+                       read_lock(&bond->lock);
+                       write_lock_bh(&bond->curr_slave_lock);
                }
        }
 }