浏览代码

[PATCH] bonding: lockdep annotation

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

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Peter Zijlstra 18 年之前
父节点
当前提交
0daa230302
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      drivers/net/bonding/bond_main.c

+ 5 - 0
drivers/net/bonding/bond_main.c

@@ -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;