Unverified Commit 5e5519a7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9522 bonding: fix oops during rmmod 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Z3FMRNXDIE4V7W7BK5EAA7J6BS4ZEVGA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA8ADY 
 
Link:https://gitee.com/openeuler/kernel/pulls/9522

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e9043632 4fe267f0

drivers/net/bonding/bond_main.c

+7 −4
Original line number Diff line number Diff line
@@ -6526,15 +6526,16 @@ static int __init bonding_init(void) 
	if (res)

		goto out;



	bond_create_debugfs();



	res = register_pernet_subsys(&bond_net_ops);

	if (res)

		goto out;

		goto err_net_ops;



	res = bond_netlink_init();

	if (res)

		goto err_link;



	bond_create_debugfs();

	bond_create_sysctl();



	for (i = 0; i < max_bonds; i++) {
@@ -6551,11 +6552,12 @@ static int __init bonding_init(void) 
out:

	return res;

err:

	bond_destroy_debugfs();

	bond_destroy_sysctl();

	bond_netlink_fini();

err_link:

	unregister_pernet_subsys(&bond_net_ops);

err_net_ops:

	bond_destroy_debugfs();

	goto out;



}
@@ -6564,12 +6566,13 @@ static void __exit bonding_exit(void) 
{

	unregister_netdevice_notifier(&bond_netdev_notifier);



	bond_destroy_debugfs();

	bond_destroy_sysctl();



	bond_netlink_fini();

	unregister_pernet_subsys(&bond_net_ops);



	bond_destroy_debugfs();



#ifdef CONFIG_NET_POLL_CONTROLLER

	/* Make sure we don't have an imbalance on our netpoll blocking */

	WARN_ON(atomic_read(&netpoll_block_tx));