[PATCH 34/38] net/sysfs: Fix the bitrot in network device kobject namespace support

From: Greg Kroah-Hartman
Date: Fri May 21 2010 - 12:55:22 EST

From: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>

I had a couple of stupid bugs in:
netns: Teach network device kobjects which namespace they are in.

- I duplicated the Kconfig for the NET_NS
- The build was broken when sysfs was not compiled in

The sysfs breakage is because after I moved the operations
for the sysfs to the kobject layer, to make things cleaner
I forgot to move the ifdefs. Opps.

I'm not quite certain how I got introduced a second NET_NS Kconfig,
but it was probably a 3 way merge somewhere along the way that
did not notice that the NET_NS Kconfig option had mvoed and thout
that was a bug. It probably slipped in because it used to be the
sysfs patches were the first patches in my network namespace patches.
Some things just don't go like you would expect.

Neither of these bugs actually affect anything in the common case
but they should be fixed.

Thanks to Serge for noticing they were present.

Reported-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
net/Kconfig | 8 --------
net/core/net-sysfs.c | 8 +++-----
2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/net/Kconfig b/net/Kconfig
index f495320..0d68b40 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -45,14 +45,6 @@ config COMPAT_NETLINK_MESSAGES

menu "Networking options"

-config NET_NS
- bool "Network namespace support"
- default n
- help
- Allow user space to create what appear to be multiple instances
- of the network stack.
source "net/packet/Kconfig"
source "net/unix/Kconfig"
source "net/xfrm/Kconfig"
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index b388cda..6881e65 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -469,6 +469,7 @@ static struct attribute_group wireless_group = {
.attrs = wireless_attrs,
+#endif /* CONFIG_SYSFS */

@@ -796,11 +797,10 @@ static void net_kobj_ns_exit(struct net *net)
kobj_ns_exit(KOBJ_NS_TYPE_NET, net);

-static struct pernet_operations sysfs_net_ops = {
+static struct pernet_operations kobj_net_ops = {
.exit = net_kobj_ns_exit,

-#endif /* CONFIG_SYSFS */

static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)
@@ -948,8 +948,6 @@ void netdev_initialize_kobject(struct net_device *net)
int netdev_kobject_init(void)
- register_pernet_subsys(&sysfs_net_ops);
+ register_pernet_subsys(&kobj_net_ops);
return class_register(&net_class);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/