lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bond: Simply bond sysfs group creation

Browse Source 
This patch delegates the work of creating the sysfs groups
to the netdev layer and ultimately to the device layer.  This
closes races between uevents.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2009-10-29 14:18:22 +00:00 committed by David S. Miller
parent 0c509a6c93
commit 6151b3d435
3 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/bonding/bond_main.c
View File

@ -2011,7 +2011,6 @@ static void bond_uninit(struct net_device *bond_dev)
struct bonding *bond = netdev_priv(bond_dev);
bond_deinit(bond_dev);
bond_destroy_sysfs_entry(bond);
if (bond->wq)
destroy_workqueue(bond->wq);
@ -3457,9 +3456,6 @@ static int bond_event_changename(struct bonding *bond)
bond_remove_proc_entry(bond);
bond_create_proc_entry(bond);
bond_destroy_sysfs_entry(bond);
bond_create_sysfs_entry(bond);
return NOTIFY_DONE;
}
@ -5078,6 +5074,7 @@ static int bond_init(struct net_device *bond_dev)
bond_create_proc_entry(bond);
list_add_tail(&bond->bond_list, &bond_dev_list);
bond_prepare_sysfs_group(bond);
return 0;
}
@ -5120,15 +5117,9 @@ int bond_create(const char *name)
if (res < 0)
goto out_bond;
res = bond_create_sysfs_entry(netdev_priv(bond_dev));
if (res < 0)
goto out_unreg;
rtnl_unlock();
return 0;
out_unreg:
unregister_netdevice(bond_dev);
out_bond:
bond_deinit(bond_dev);
out_netdev:

20
drivers/net/bonding/bond_sysfs.c
View File

@ -1616,24 +1616,8 @@ void bond_destroy_sysfs(void)
* Initialize sysfs for each bond. This sets up and registers
* the 'bondctl' directory for each individual bond under /sys/class/net.
*/
int bond_create_sysfs_entry(struct bonding *bond)
void bond_prepare_sysfs_group(struct bonding *bond)
{
struct net_device *dev = bond->dev;
int err;
err = sysfs_create_group(&(dev->dev.kobj), &bonding_group);
if (err)
pr_emerg("eek! didn't create group!\n");
return err;
}
/*
* Remove sysfs entries for each bond.
*/
void bond_destroy_sysfs_entry(struct bonding *bond)
{
struct net_device *dev = bond->dev;
sysfs_remove_group(&(dev->dev.kobj), &bonding_group);
bond->dev->sysfs_groups[0] = &bonding_group;
}

3
drivers/net/bonding/bonding.h
View File

@ -331,8 +331,7 @@ int bond_create(const char *name);
int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_create_sysfs(void);
void bond_destroy_sysfs(void);
void bond_destroy_sysfs_entry(struct bonding *bond);
int bond_create_sysfs_entry(struct bonding *bond);
void bond_prepare_sysfs_group(struct bonding *bond);
int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave);
void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave);
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);