proc: consolidate per-net single-release callers

They are symmetrical to single_open ones :)

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 7 insertions, 62 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 6009df238ed9..5cb72786a8af 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2254,19 +2254,12 @@ static int fib_triestat_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, fib_triestat_seq_show);
 }
 
-static int fib_triestat_seq_release(struct inode *ino, struct file *f)
-{
-        struct seq_file *seq = f->private_data;
-        put_net(seq->private);
-        return single_release(ino, f);
-}
-
 static const struct file_operations fib_triestat_fops = {
         .owner  = THIS_MODULE,
         .open   = fib_triestat_seq_open,
         .read   = seq_read,
         .llseek = seq_lseek,
-        .release = fib_triestat_seq_release,
+        .release = single_release_net,
 };
 
 static struct node *fib_trie_get_idx(struct seq_file *seq, loff_t pos)
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index daf5d3c80cef..834356ea99df 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -74,20 +74,12 @@ static int sockstat_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, sockstat_seq_show);
 }
 
-static int sockstat_seq_release(struct inode *inode, struct file *file)
-{
-        struct net *net = ((struct seq_file *)file->private_data)->private;
-
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations sockstat_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = sockstat_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = sockstat_seq_release,
+        .release = single_release_net,
 };
 
 /* snmp items */
@@ -383,20 +375,12 @@ static int snmp_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, snmp_seq_show);
 }
 
-static int snmp_seq_release(struct inode *inode, struct file *file)
-{
-        struct net *net = ((struct seq_file *)file->private_data)->private;
-
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations snmp_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = snmp_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = snmp_seq_release,
+        .release = single_release_net,
 };
 
 
@@ -438,20 +422,12 @@ static int netstat_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, netstat_seq_show);
 }
 
-static int netstat_seq_release(struct inode *inode, struct file *file)
-{
-        struct net *net = ((struct seq_file *)file->private_data)->private;
-
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations netstat_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = netstat_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = netstat_seq_release,
+        .release = single_release_net,
 };
 
 static __net_init int ip_proc_init_net(struct net *net)
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 29c5a79444c2..70940b3654a1 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -186,20 +186,12 @@ static int sockstat6_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, sockstat6_seq_show);
 }
 
-static int sockstat6_seq_release(struct inode *inode, struct file *file)
-{
-        struct net *net = ((struct seq_file *)file->private_data)->private;
-
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations sockstat6_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = sockstat6_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = sockstat6_seq_release,
+        .release = single_release_net,
 };
 
 static int snmp6_seq_open(struct inode *inode, struct file *file)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fb7ff8f0c6db..cb8a51271b67 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2419,20 +2419,12 @@ static int ipv6_route_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, ipv6_route_show);
 }
 
-static int ipv6_route_release(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq = file->private_data;
-        struct net *net = seq->private;
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations ipv6_route_proc_fops = {
         .owner          = THIS_MODULE,
         .open           = ipv6_route_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = ipv6_route_release,
+        .release        = single_release_net,
 };
 
 static int rt6_stats_seq_show(struct seq_file *seq, void *v)
@@ -2455,20 +2447,12 @@ static int rt6_stats_seq_open(struct inode *inode, struct file *file)
         return single_open_net(inode, file, rt6_stats_seq_show);
 }
 
-static int rt6_stats_seq_release(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq = file->private_data;
-        struct net *net = (struct net *)seq->private;
-        put_net(net);
-        return single_release(inode, file);
-}
-
 static const struct file_operations rt6_stats_seq_fops = {
         .owner   = THIS_MODULE,
         .open    = rt6_stats_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = rt6_stats_seq_release,
+        .release = single_release_net,
 };
 #endif  /* CONFIG_PROC_FS */