Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[linux-2.6] / net / ipv4 / proc.c

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 554390431a4e7f1b70dc42b175ffb29661e9e376..834356ea99df92a0b9ffbc3d70d4c21e3b400889 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -71,32 +71,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
 
 static int sockstat_seq_open(struct inode *inode, struct file *file)
 {
-       int err;
-       struct net *net;
-
-       err = -ENXIO;
-       net = get_proc_net(inode);
-       if (net == NULL)
-               goto err_net;
-
-       err = single_open(file, sockstat_seq_show, net);
-       if (err < 0)
-               goto err_open;
-
-       return 0;
-
-err_open:
-       put_net(net);
-err_net:
-       return err;
-}
-
-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);
+       return single_open_net(inode, file, sockstat_seq_show);
 }
 
 static const struct file_operations sockstat_seq_fops = {
@@ -104,7 +79,7 @@ static const struct file_operations sockstat_seq_fops = {
        .open    = sockstat_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = sockstat_seq_release,
+       .release = single_release_net,
 };
 
 /* snmp items */
@@ -397,32 +372,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v)
 
 static int snmp_seq_open(struct inode *inode, struct file *file)
 {
-       int err;
-       struct net *net;
-
-       err = -ENXIO;
-       net = get_proc_net(inode);
-       if (net == NULL)
-               goto err_net;
-
-       err = single_open(file, snmp_seq_show, net);
-       if (err < 0)
-               goto err_open;
-
-       return 0;
-
-err_open:
-       put_net(net);
-err_net:
-       return err;
-}
-
-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);
+       return single_open_net(inode, file, snmp_seq_show);
 }
 
 static const struct file_operations snmp_seq_fops = {
@@ -430,7 +380,7 @@ static const struct file_operations snmp_seq_fops = {
        .open    = snmp_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = snmp_seq_release,
+       .release = single_release_net,
 };
 
 
@@ -469,32 +419,7 @@ static int netstat_seq_show(struct seq_file *seq, void *v)
 
 static int netstat_seq_open(struct inode *inode, struct file *file)
 {
-       int err;
-       struct net *net;
-
-       err = -ENXIO;
-       net = get_proc_net(inode);
-       if (net == NULL)
-               goto err_net;
-
-       err = single_open(file, netstat_seq_show, net);
-       if (err < 0)
-               goto err_open;
-
-       return 0;
-
-err_open:
-       put_net(net);
-err_net:
-       return err;
-}
-
-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);
+       return single_open_net(inode, file, netstat_seq_show);
 }
 
 static const struct file_operations netstat_seq_fops = {
@@ -502,7 +427,7 @@ static const struct file_operations netstat_seq_fops = {
        .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)