Commit d0538ca3 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[SOCK][NETNS]: Register sockstat(6) files in each net. 



Currently they live in init_net only, but now almost all the info
they can provide is available per-net.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70ee1159

net/ipv4/proc.c

+22 −5
Original line number Diff line number Diff line
@@ -426,25 +426,42 @@ static const struct file_operations netstat_seq_fops = { 
	.release = single_release,

};



static __net_init int ip_proc_init_net(struct net *net)

{

	if (!proc_net_fops_create(net, "sockstat", S_IRUGO, &sockstat_seq_fops))

		return -ENOMEM;

	return 0;

}



static __net_exit void ip_proc_exit_net(struct net *net)

{

	proc_net_remove(net, "sockstat");

}



static __net_initdata struct pernet_operations ip_proc_ops = {

	.init = ip_proc_init_net,

	.exit = ip_proc_exit_net,

};



int __init ip_misc_proc_init(void)

{

	int rc = 0;



	if (register_pernet_subsys(&ip_proc_ops))

		goto out_pernet;



	if (!proc_net_fops_create(&init_net, "netstat", S_IRUGO, &netstat_seq_fops))

		goto out_netstat;



	if (!proc_net_fops_create(&init_net, "snmp", S_IRUGO, &snmp_seq_fops))

		goto out_snmp;



	if (!proc_net_fops_create(&init_net, "sockstat", S_IRUGO, &sockstat_seq_fops))

		goto out_sockstat;

out:

	return rc;

out_sockstat:

	proc_net_remove(&init_net, "snmp");

out_snmp:

	proc_net_remove(&init_net, "netstat");

out_netstat:

	unregister_pernet_subsys(&ip_proc_ops);

out_pernet:

	rc = -ENOMEM;

	goto out;

}

net/ipv6/proc.c

+24 −5
Original line number Diff line number Diff line
@@ -243,27 +243,45 @@ int snmp6_unregister_dev(struct inet6_dev *idev) 
	return 0;

}



static int ipv6_proc_init_net(struct net *net)

{

	if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,

			&sockstat6_seq_fops))

		return -ENOMEM;

	return 0;

}



static void ipv6_proc_exit_net(struct net *net)

{

	proc_net_remove(net, "sockstat6");

}



static struct pernet_operations ipv6_proc_ops = {

	.init = ipv6_proc_init_net,

	.exit = ipv6_proc_exit_net,

};



int __init ipv6_misc_proc_init(void)

{

	int rc = 0;



	if (register_pernet_subsys(&ipv6_proc_ops))

		goto proc_net_fail;



	if (!proc_net_fops_create(&init_net, "snmp6", S_IRUGO, &snmp6_seq_fops))

		goto proc_snmp6_fail;



	proc_net_devsnmp6 = proc_mkdir("dev_snmp6", init_net.proc_net);

	if (!proc_net_devsnmp6)

		goto proc_dev_snmp6_fail;



	if (!proc_net_fops_create(&init_net, "sockstat6", S_IRUGO, &sockstat6_seq_fops))

		goto proc_sockstat6_fail;

out:

	return rc;



proc_sockstat6_fail:

	proc_net_remove(&init_net, "dev_snmp6");

proc_dev_snmp6_fail:

	proc_net_remove(&init_net, "snmp6");

proc_snmp6_fail:

	unregister_pernet_subsys(&ipv6_proc_ops);

proc_net_fail:

	rc = -ENOMEM;

	goto out;

}
@@ -273,5 +291,6 @@ void ipv6_misc_proc_exit(void) 
	proc_net_remove(&init_net, "sockstat6");

	proc_net_remove(&init_net, "dev_snmp6");

	proc_net_remove(&init_net, "snmp6");

	unregister_pernet_subsys(&ipv6_proc_ops);

}