proc: introduce proc_create_net{,_data}

Variants of proc_create{,_data} that directly take a struct seq_operations
and deal with network namespaces in ->open and ->release.  All callers of
proc_create + seq_open_net converted over, and seq_{open,release}_net are
removed entirely.

Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 6 insertions, 43 deletions

diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index c4e8ebe55e26..63881f72ef71 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -175,19 +175,6 @@ static const struct seq_operations dev_seq_ops = {
         .show  = dev_seq_show,
 };
 
-static int dev_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &dev_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations dev_seq_fops = {
-        .open    = dev_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static const struct seq_operations softnet_seq_ops = {
         .start = softnet_seq_start,
         .next  = softnet_seq_next,
@@ -285,30 +272,18 @@ static const struct seq_operations ptype_seq_ops = {
         .show  = ptype_seq_show,
 };
 
-static int ptype_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ptype_seq_ops,
-                        sizeof(struct seq_net_private));
-}
-
-static const struct file_operations ptype_seq_fops = {
-        .open    = ptype_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
-
 static int __net_init dev_proc_net_init(struct net *net)
 {
         int rc = -ENOMEM;
 
-        if (!proc_create("dev", 0444, net->proc_net, &dev_seq_fops))
+        if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
+                        sizeof(struct seq_net_private)))
                 goto out;
         if (!proc_create_seq("softnet_stat", 0444, net->proc_net,
                          &softnet_seq_ops))
                 goto out_dev;
-        if (!proc_create("ptype", 0444, net->proc_net, &ptype_seq_fops))
+        if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
+                        sizeof(struct seq_net_private)))
                 goto out_softnet;
 
         if (wext_proc_init(net))
@@ -365,22 +340,10 @@ static const struct seq_operations dev_mc_seq_ops = {
         .show  = dev_mc_seq_show,
 };
 
-static int dev_mc_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &dev_mc_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations dev_mc_seq_fops = {
-        .open    = dev_mc_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int __net_init dev_mc_net_init(struct net *net)
 {
-        if (!proc_create("dev_mcast", 0, net->proc_net, &dev_mc_seq_fops))
+        if (!proc_create_net("dev_mcast", 0, net->proc_net, &dev_mc_seq_ops,
+                        sizeof(struct seq_net_private)))
                 return -ENOMEM;
         return 0;
 }