Skip to content

Commit 0daa230

Browse files
Peter ZijlstraJeff Garzik
authored andcommitted
[PATCH] bonding: lockdep annotation
============================================= [ INFO: possible recursive locking detected ] 2.6.17-1.2600.fc6 #1 Signed-off-by: Jeff Garzik <[email protected]>
1 parent 088406b commit 0daa230

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond_params *params)
46924692
return 0;
46934693
}
46944694

4695+
static struct lock_class_key bonding_netdev_xmit_lock_key;
4696+
46954697
/* Create a new bond based on the specified name and bonding parameters.
46964698
* Caller must NOT hold rtnl_lock; we need to release it here before we
46974699
* set up our sysfs entries.
@@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
47274729
if (res < 0) {
47284730
goto out_bond;
47294731
}
4732+
4733+
lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);
4734+
47304735
if (newbond)
47314736
*newbond = bond_dev->priv;
47324737

0 commit comments

Comments
 (0)