Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / net / ipv4 / fib_trie.c

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 65c340f..5bc0c89 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2352,18 +2352,6 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static int fib_triestat_seq_open(struct inode *inode, struct file *file)
-{
-       return single_open_net(inode, file, fib_triestat_seq_show);
-}
-
-static const struct file_operations fib_triestat_fops = {
-       .open   = fib_triestat_seq_open,
-       .read   = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release_net,
-};
-
 static struct key_vector *fib_trie_get_idx(struct seq_file *seq, loff_t pos)
 {
        struct fib_trie_iter *iter = seq->private;
@@ -2537,19 +2525,6 @@ static const struct seq_operations fib_trie_seq_ops = {
        .show   = fib_trie_seq_show,
 };
 
-static int fib_trie_seq_open(struct inode *inode, struct file *file)
-{
-       return seq_open_net(inode, file, &fib_trie_seq_ops,
-                           sizeof(struct fib_trie_iter));
-}
-
-static const struct file_operations fib_trie_fops = {
-       .open   = fib_trie_seq_open,
-       .read   = seq_read,
-       .llseek = seq_lseek,
-       .release = seq_release_net,
-};
-
 struct fib_route_iter {
        struct seq_net_private p;
        struct fib_table *main_tb;
@@ -2730,29 +2705,18 @@ static const struct seq_operations fib_route_seq_ops = {
        .show   = fib_route_seq_show,
 };
 
-static int fib_route_seq_open(struct inode *inode, struct file *file)
-{
-       return seq_open_net(inode, file, &fib_route_seq_ops,
-                           sizeof(struct fib_route_iter));
-}
-
-static const struct file_operations fib_route_fops = {
-       .open   = fib_route_seq_open,
-       .read   = seq_read,
-       .llseek = seq_lseek,
-       .release = seq_release_net,
-};
-
 int __net_init fib_proc_init(struct net *net)
 {
-       if (!proc_create("fib_trie", 0444, net->proc_net, &fib_trie_fops))
+       if (!proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
+                       sizeof(struct fib_trie_iter)))
                goto out1;
 
-       if (!proc_create("fib_triestat", 0444, net->proc_net,
-                        &fib_triestat_fops))
+       if (!proc_create_net_single("fib_triestat", 0444, net->proc_net,
+                       fib_triestat_seq_show, NULL))
                goto out2;
 
-       if (!proc_create("route", 0444, net->proc_net, &fib_route_fops))
+       if (!proc_create_net("route", 0444, net->proc_net, &fib_route_seq_ops,
+                       sizeof(struct fib_route_iter)))
                goto out3;
 
        return 0;