From 01718e36df750670d0f840932a4d166522ead6c3 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 21 Oct 2011 22:43:07 +0000 Subject: [PATCH] bonding: Add a forgetten sysfs_attr_init on class_attr_bonding_masters When I made class_attr_bonding_matters per network namespace and dynamically allocated I overlooked the need for calling sysfs_attr_init. Oops. This fixes the following lockdep splat: [ 5.749651] bonding: Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011) [ 5.749655] bonding: MII link monitoring set to 100 ms [ 5.749676] BUG: key f49a831c not in .data! [ 5.749677] ------------[ cut here ]------------ [ 5.749752] WARNING: at kernel/lockdep.c:2897 lockdep_init_map+0x1c3/0x460() [ 5.749809] Hardware name: ProLiant BL460c G1 [ 5.749862] Modules linked in: bonding(+) [ 5.749978] Pid: 3177, comm: modprobe Not tainted 3.1.0-rc9-02177-gf2d1a4e-dirty #1157 [ 5.750066] Call Trace: [ 5.750120] [] ? printk+0x18/0x21 [ 5.750176] [] warn_slowpath_common+0x6d/0xa0 [ 5.750231] [] ? lockdep_init_map+0x1c3/0x460 [ 5.750287] [] ? lockdep_init_map+0x1c3/0x460 [ 5.750342] [] warn_slowpath_null+0x1d/0x20 [ 5.750398] [] lockdep_init_map+0x1c3/0x460 [ 5.750453] [] ? _raw_spin_unlock+0x1d/0x20 [ 5.750510] [] ? sysfs_new_dirent+0x68/0x110 [ 5.750565] [] sysfs_add_file_mode+0x8b/0xe0 [ 5.750621] [] sysfs_add_file+0x13/0x20 [ 5.750675] [] sysfs_create_file+0x1c/0x20 [ 5.750737] [] class_create_file+0x19/0x20 [ 5.750794] [] netdev_class_create_file+0xf/0x20 [ 5.750853] [] bond_create_sysfs+0x44/0x90 [bonding] [ 5.750911] [] ? bond_create_proc_dir+0x1e/0x3e [bonding] [ 5.750970] [] bond_net_init+0x7e/0x87 [bonding] [ 5.751026] [] ? 0xf840ffff [ 5.751080] [] ops_init.clone.4+0xba/0x100 [ 5.751135] [] ? register_pernet_subsys+0x12/0x30 [ 5.751191] [] register_pernet_operations.clone.3+0x43/0x80 [ 5.751249] [] register_pernet_subsys+0x19/0x30 [ 5.751306] [] bonding_init+0x832/0x8a2 [bonding] [ 5.751363] [] do_one_initcall+0x30/0x160 [ 5.751420] [] ? bond_net_init+0x87/0x87 [bonding] [ 5.751477] [] sys_init_module+0xef/0x1890 [ 5.751533] [] sysenter_do_call+0x12/0x36 [ 5.751588] ---[ end trace 89f492d83a7f5006 ]--- Signed-off-by: Eric W. Biederman Reported-by: Eric Dumazet Tested-by: Eric Dumazet Signed-off-by: David S. Miller --- drivers/net/bonding/bond_sysfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 6044ff809c2a..5a20804fdece 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1675,6 +1675,7 @@ int bond_create_sysfs(struct bond_net *bn) int ret; bn->class_attr_bonding_masters = class_attr_bonding_masters; + sysfs_attr_init(&bn->class_attr_bonding_masters.attr); ret = netdev_class_create_file(&bn->class_attr_bonding_masters); /*