From: Pavel Emelyanov <xemul@parallels•com>
To: Linux Netdev List <netdev@vger•kernel.org>,
David Miller <davem@davemloft•net>,
Eric Dumazet <eric.dumazet@gmail•com>
Subject: [PATCH 1/2] unix: Reformat proc files creation
Date: Thu, 01 Dec 2011 21:41:43 +0400 [thread overview]
Message-ID: <4ED7BC57.5070903@parallels.com> (raw)
In-Reply-To: <4ED7BC37.2030805@parallels.com>
This just makes codepaths better prepared for yet another
proc file creation.
Signed-off-by: Pavel Emelyanov <xemul@parallels•com>
---
net/unix/af_unix.c | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 466fbcc..4b83a9c 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2326,6 +2326,29 @@ static const struct file_operations unix_seq_fops = {
.release = seq_release_net,
};
+static int unix_proc_create(struct net *net)
+{
+ if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops))
+ goto out;
+
+ return 0;
+out:
+ return -ENOMEM;
+}
+
+static void unix_proc_destroy(struct net *net)
+{
+ proc_net_remove(net, "unix");
+}
+#else
+static inline int unix_proc_create(struct net *net)
+{
+ return 0;
+}
+
+static inline void unix_proc_destroy(struct net *net)
+{
+}
#endif
static const struct net_proto_family unix_family_ops = {
@@ -2343,13 +2366,10 @@ static int __net_init unix_net_init(struct net *net)
if (unix_sysctl_register(net))
goto out;
-#ifdef CONFIG_PROC_FS
- if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) {
+ error = unix_proc_create(net);
+ if (error)
unix_sysctl_unregister(net);
- goto out;
- }
-#endif
- error = 0;
+
out:
return error;
}
@@ -2357,7 +2377,7 @@ out:
static void __net_exit unix_net_exit(struct net *net)
{
unix_sysctl_unregister(net);
- proc_net_remove(net, "unix");
+ unix_proc_destroy(net);
}
static struct pernet_operations unix_net_ops = {
--
1.5.5.6
next prev parent reply other threads:[~2011-12-01 17:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-01 17:41 [PATCH 0/2] unix: Introduce /proc/net/unix_peers file Pavel Emelyanov
2011-12-01 17:41 ` Pavel Emelyanov [this message]
2011-12-01 17:42 ` [PATCH 2/2] unix: Add " Pavel Emelyanov
2011-12-04 18:25 ` David Miller
2011-12-05 10:25 ` Pavel Emelyanov
2011-12-05 23:47 ` 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=4ED7BC57.5070903@parallels.com \
--to=xemul@parallels$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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