netfilter: netns nf_conntrack: per-netns /proc/net/nf_conntrack_expect (dc5129f8) · Commits · 戴 / test

net/netfilter/nf_conntrack_expect.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -423,12 +423,13 @@ EXPORT_SYMBOL_GPL(nf_ct_expect_related);

		#ifdef CONFIG_PROC_FS
		struct ct_expect_iter_state {
		struct seq_net_private p;
		unsigned int bucket;
		};

		static struct hlist_node ct_expect_get_first(struct seq_file seq)
		{
		struct net *net = &init_net;
		struct net *net = seq_file_net(seq);
		struct ct_expect_iter_state *st = seq->private;
		struct hlist_node *n;

		@@ -443,7 +444,7 @@ static struct hlist_node ct_expect_get_first(struct seq_file seq)
		static struct hlist_node ct_expect_get_next(struct seq_file seq,
		struct hlist_node *head)
		{
		struct net *net = &init_net;
		struct net *net = seq_file_net(seq);
		struct ct_expect_iter_state *st = seq->private;

		head = rcu_dereference(head->next);
		@@ -524,7 +525,7 @@ static const struct seq_operations exp_seq_ops = {

		static int exp_open(struct inode inode, struct file file)
		{
		return seq_open_private(file, &exp_seq_ops,
		return seq_open_net(inode, file, &exp_seq_ops,
		sizeof(struct ct_expect_iter_state));
		}

		@@ -533,26 +534,26 @@ static const struct file_operations exp_file_ops = {
		.open = exp_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release_private,
		.release = seq_release_net,
		};
		#endif /* CONFIG_PROC_FS */

		static int exp_proc_init(void)
		static int exp_proc_init(struct net *net)
		{
		#ifdef CONFIG_PROC_FS
		struct proc_dir_entry *proc;

		proc = proc_net_fops_create(&init_net, "nf_conntrack_expect", 0440, &exp_file_ops);
		proc = proc_net_fops_create(net, "nf_conntrack_expect", 0440, &exp_file_ops);
		if (!proc)
		return -ENOMEM;
		#endif /* CONFIG_PROC_FS */
		return 0;
		}

		static void exp_proc_remove(void)
		static void exp_proc_remove(struct net *net)
		{
		#ifdef CONFIG_PROC_FS
		proc_net_remove(&init_net, "nf_conntrack_expect");
		proc_net_remove(net, "nf_conntrack_expect");
		#endif /* CONFIG_PROC_FS */
		}

		@@ -581,7 +582,7 @@ int nf_conntrack_expect_init(struct net *net)
		if (!nf_ct_expect_cachep)
		goto err2;

		err = exp_proc_init();
		err = exp_proc_init(net);
		if (err < 0)
		goto err3;

		@@ -598,7 +599,7 @@ err1:

		void nf_conntrack_expect_fini(struct net *net)
		{
		exp_proc_remove();
		exp_proc_remove(net);
		kmem_cache_destroy(nf_ct_expect_cachep);
		nf_ct_free_hashtable(net->ct.expect_hash, net->ct.expect_vmalloc,
		nf_ct_expect_hsize);

Admin message