Commit db018a5f authored Jul 02, 2008 by Moni Shoua Committed by Jeff Garzik Aug 07, 2008

bonding: Don't destroy bonding master when removing slave via sysfs



It is wrong to destroy a bonding master from a context that uses the sysfs
of that bond. When last IPoIB slave is unenslaved from by writing to a
sysfs file (for bond0 this would be /sys/class/net/bond0/bonding/slaves)
the driver tries to destroy the bond. This is wrong and can lead to a
lockup or a crash.  This fix lets the bonding master stay and relies on
the user to destroy the bonding master if necessary (i.e. before module
ib_ipoib is unloaded)

This patch affects only bonds of IPoIB slaves. Ethernet slaves stay
unaffected.

Signed-off-by: Moni Shoua <monis@voltaire.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent f0c76d61

drivers/net/bonding/bond_sysfs.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -350,9 +350,6 @@ static ssize_t bonding_store_slaves(struct device *d,
	if (dev) {		if (dev) {
	printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",		printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
	bond->dev->name, dev->name);		bond->dev->name, dev->name);
	if (bond->setup_by_slave)
	res = bond_release_and_destroy(bond->dev, dev);
	else
	res = bond_release(bond->dev, dev);		res = bond_release(bond->dev, dev);
	if (res) {		if (res) {
	ret = res;		ret = res;