Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0daa2303 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Jeff Garzik
Browse files

[PATCH] bonding: lockdep annotation 



=============================================
[ INFO: possible recursive locking detected ]
2.6.17-1.2600.fc6 #1

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 088406bc

drivers/net/bonding/bond_main.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond_params *params) 
	return 0;

	return 0;

}

}





static struct lock_class_key bonding_netdev_xmit_lock_key;



/* Create a new bond based on the specified name and bonding parameters.

/* Create a new bond based on the specified name and bonding parameters.

 * Caller must NOT hold rtnl_lock; we need to release it here before we

 * Caller must NOT hold rtnl_lock; we need to release it here before we

 * set up our sysfs entries.

 * set up our sysfs entries.
@@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond 
	if (res < 0) {

	if (res < 0) {

		goto out_bond;

		goto out_bond;

	}

	}



	lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);



	if (newbond)

	if (newbond)

		*newbond = bond_dev->priv;

		*newbond = bond_dev->priv;