mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Denis V. Lunev" <den@openvz.org>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, "Denis V. Lunev" <den@openvz.org>,
	Alexey Dobriyan <adobriyan@openvz.org>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Patrick McHardy <kaber@trash.net>
Subject: [PATCH 10/12] netfilter: assign PDE->fops before gluing PDE into /proc tree
Date: Tue, 29 Apr 2008 15:13:20 +0400	[thread overview]
Message-ID: <1209467602-20001-10-git-send-email-den@openvz.org> (raw)
In-Reply-To: <1209467538.29647.11.camel@iris.sw.ru>

Replace create_proc_entry with specially created for this purpose proc_create.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Patrick McHardy <kaber@trash.net>
---
 net/netfilter/nf_conntrack_standalone.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index b59871f..46ea542 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -296,11 +296,11 @@ static int nf_conntrack_standalone_init_proc(void)
 	pde = proc_net_fops_create(&init_net, "nf_conntrack", 0440, &ct_file_ops);
 	if (!pde)
 		goto out_nf_conntrack;
-	pde = create_proc_entry("nf_conntrack", S_IRUGO, init_net.proc_net_stat);
+
+	pde = proc_create("nf_conntrack", S_IRUGO, init_net.proc_net_stat,
+			  &ct_cpu_seq_fops);
 	if (!pde)
 		goto out_stat_nf_conntrack;
-	pde->proc_fops = &ct_cpu_seq_fops;
-	pde->owner = THIS_MODULE;
 	return 0;
 
 out_stat_nf_conntrack:
-- 
1.5.3.rc5


  parent reply	other threads:[~2008-04-29 11:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-29 11:12 [PATCH 0/12] Further PDE->data assignments cleanups Denis V. Lunev
2008-04-29 11:13 ` [PATCH 1/12] sunrpc: assign PDE->data before gluing PDE into /proc tree Denis V. Lunev
2008-05-02  9:44   ` David Miller
2008-04-29 11:13 ` [PATCH 2/12] netfilter: " Denis V. Lunev
2008-05-02  9:45   ` David Miller
2008-04-29 11:13 ` [PATCH 3/12] net: " Denis V. Lunev
2008-05-02  9:46   ` David Miller
2008-04-29 11:13 ` [PATCH 4/12] ipv6: " Denis V. Lunev
2008-05-02  9:47   ` David Miller
2008-04-29 11:13 ` [PATCH 5/12] atm: " Denis V. Lunev
2008-05-02 11:08   ` David Miller
2008-04-29 11:13 ` [PATCH 6/12] vlan: " Denis V. Lunev
2008-05-02 11:09   ` David Miller
2008-04-29 11:13 ` [PATCH 7/12] cciss: " Denis V. Lunev
2008-04-29 15:26   ` Miller, Mike (OS Dev)
2008-04-29 11:13 ` [PATCH 8/12] powerpc: " Denis V. Lunev
2008-04-29 11:13 ` [PATCH 9/12] ipv4: " Denis V. Lunev
2008-05-02 11:10   ` David Miller
2008-07-12  3:12   ` Stoyan Gaydarov
2008-07-12  3:42     ` Eric W. Biederman
2008-07-12 14:55     ` Denis V. Lunev
2008-04-29 11:13 ` Denis V. Lunev [this message]
2008-05-02 11:11   ` [PATCH 10/12] netfilter: assign PDE->fops " David Miller
2008-04-29 11:13 ` [PATCH 11/12] netfilter: assign PDE->data " Denis V. Lunev
2008-04-29 12:01   ` Patrick McHardy
2008-05-02 11:12   ` David Miller
2008-04-29 11:13 ` [PATCH 12/12] netns: assign PDE->data before gluing entry " Denis V. Lunev
2008-05-02 11:12   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1209467602-20001-10-git-send-email-den@openvz.org \
    --to=den@openvz.org \
    --cc=adobriyan@openvz.org \
    --cc=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=kaber@trash.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®