Commit e7511f56 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

bonding: remove useless stats_lock_key

After commit b3e80d44
("bonding: fix lockdep warning in bond_get_stats()") the dynamic
key is no longer necessary, as we compute nest level at run-time.
So, we can just remove it to save some lockdep key entries.

Test commands:
 ip link add bond0 type bond
 ip link add bond1 type bond
 ip link set bond0 master bond1
 ip link set bond0 nomaster
 ip link set bond1 master bond0

Reported-and-tested-by: syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com
Cc: Dmitry Vyukov <dvyukov@google.com>
Acked-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a33e10e
...@@ -4491,7 +4491,6 @@ static void bond_uninit(struct net_device *bond_dev) ...@@ -4491,7 +4491,6 @@ static void bond_uninit(struct net_device *bond_dev)
list_del(&bond->bond_list); list_del(&bond->bond_list);
lockdep_unregister_key(&bond->stats_lock_key);
bond_debug_unregister(bond); bond_debug_unregister(bond);
} }
...@@ -4896,8 +4895,6 @@ static int bond_init(struct net_device *bond_dev) ...@@ -4896,8 +4895,6 @@ static int bond_init(struct net_device *bond_dev)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&bond->stats_lock); spin_lock_init(&bond->stats_lock);
lockdep_register_key(&bond->stats_lock_key);
lockdep_set_class(&bond->stats_lock, &bond->stats_lock_key);
netdev_lockdep_set_classes(bond_dev); netdev_lockdep_set_classes(bond_dev);
list_add_tail(&bond->bond_list, &bn->dev_list); list_add_tail(&bond->bond_list, &bn->dev_list);
......
...@@ -237,7 +237,6 @@ struct bonding { ...@@ -237,7 +237,6 @@ struct bonding {
struct dentry *debug_dir; struct dentry *debug_dir;
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
struct rtnl_link_stats64 bond_stats; struct rtnl_link_stats64 bond_stats;
struct lock_class_key stats_lock_key;
}; };
#define bond_slave_get_rcu(dev) \ #define bond_slave_get_rcu(dev) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment