[NETFILTER]: Make netfilter code use the seq_open_private

Just switch to the consolidated calls.

ipt_recent() has to initialize the private, so use
the __seq_open_private() helper.

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

6 files changed, 14 insertions, 109 deletions

diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index db2a79889f9a..11d39fb5f38b 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -381,25 +381,14 @@ static const struct seq_operations recent_seq_ops = {
 static int recent_seq_open(struct inode *inode, struct file *file)
 {
         struct proc_dir_entry *pde = PDE(inode);
-        struct seq_file *seq;
         struct recent_iter_state *st;
-        int ret;
 
-        st = kzalloc(sizeof(*st), GFP_KERNEL);
+        st = __seq_open_private(file, &recent_seq_ops, sizeof(*st));
         if (st == NULL)
                 return -ENOMEM;
 
-        ret = seq_open(file, &recent_seq_ops);
-        if (ret) {
-                kfree(st);
-                goto out;
-        }
-
         st->table    = pde->data;
-        seq          = file->private_data;
-        seq->private = st;
-out:
-        return ret;
+        return 0;
 }
 
 static ssize_t recent_proc_write(struct file *file, const char __user *input,
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index a5ae2eabf0f3..741f3dfaa5a1 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -174,22 +174,8 @@ static const struct seq_operations ct_seq_ops = {
 
 static int ct_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct ct_iter_state *st;
-        int ret;
-
-        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
-        if (st == NULL)
-                return -ENOMEM;
-        ret = seq_open(file, &ct_seq_ops);
-        if (ret)
-                goto out_free;
-        seq          = file->private_data;
-        seq->private = st;
-        return ret;
-out_free:
-        kfree(st);
-        return ret;
+        return seq_open_private(file, &ct_seq_ops,
+                        sizeof(struct ct_iter_state));
 }
 
 static const struct file_operations ct_file_ops = {
@@ -291,22 +277,8 @@ static const struct seq_operations exp_seq_ops = {
 
 static int exp_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct ct_expect_iter_state *st;
-        int ret;
-
-        st = kzalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);
-        if (!st)
-                return -ENOMEM;
-        ret = seq_open(file, &exp_seq_ops);
-        if (ret)
-                goto out_free;
-        seq          = file->private_data;
-        seq->private = st;
-        return ret;
-out_free:
-        kfree(st);
-        return ret;
+        return seq_open_private(file, &exp_seq_ops,
+                        sizeof(struct ct_expect_iter_state));
 }
 
 static const struct file_operations ip_exp_file_ops = {
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 7a0ae36c9b47..175c8d1a1992 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -472,22 +472,8 @@ static const struct seq_operations exp_seq_ops = {
 
 static int exp_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct ct_expect_iter_state *st;
-        int ret;
-
-        st = kzalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);
-        if (!st)
-                return -ENOMEM;
-        ret = seq_open(file, &exp_seq_ops);
-        if (ret)
-                goto out_free;
-        seq          = file->private_data;
-        seq->private = st;
-        return ret;
-out_free:
-        kfree(st);
-        return ret;
+        return seq_open_private(file, &exp_seq_ops,
+                        sizeof(struct ct_expect_iter_state));
 }
 
 static const struct file_operations exp_file_ops = {
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 2a19c5f1240f..9efdd37fc195 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -195,22 +195,8 @@ static const struct seq_operations ct_seq_ops = {
 
 static int ct_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct ct_iter_state *st;
-        int ret;
-
-        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
-        if (st == NULL)
-                return -ENOMEM;
-        ret = seq_open(file, &ct_seq_ops);
-        if (ret)
-                goto out_free;
-        seq          = file->private_data;
-        seq->private = st;
-        return ret;
-out_free:
-        kfree(st);
-        return ret;
+        return seq_open_private(file, &ct_seq_ops,
+                        sizeof(struct ct_iter_state));
 }
 
 static const struct file_operations ct_file_ops = {
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 2135926199ca..2c7bd2eb0294 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -951,22 +951,8 @@ static const struct seq_operations nful_seq_ops = {
 
 static int nful_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct iter_state *is;
-        int ret;
-
-        is = kzalloc(sizeof(*is), GFP_KERNEL);
-        if (!is)
-                return -ENOMEM;
-        ret = seq_open(file, &nful_seq_ops);
-        if (ret < 0)
-                goto out_free;
-        seq = file->private_data;
-        seq->private = is;
-        return ret;
-out_free:
-        kfree(is);
-        return ret;
+        return seq_open_private(file, &nful_seq_ops,
+                        sizeof(struct iter_state));
 }
 
 static const struct file_operations nful_file_ops = {
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 48e095a7de2d..49f0480afe09 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1051,22 +1051,8 @@ static const struct seq_operations nfqnl_seq_ops = {
 
 static int nfqnl_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        struct iter_state *is;
-        int ret;
-
-        is = kzalloc(sizeof(*is), GFP_KERNEL);
-        if (!is)
-                return -ENOMEM;
-        ret = seq_open(file, &nfqnl_seq_ops);
-        if (ret < 0)
-                goto out_free;
-        seq = file->private_data;
-        seq->private = is;
-        return ret;
-out_free:
-        kfree(is);
-        return ret;
+        return seq_open_private(file, &nfqnl_seq_ops,
+                        sizeof(struct iter_state));
 }
 
 static const struct file_operations nfqnl_file_ops = {