[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>

1 files changed, 4 insertions, 32 deletions

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index a5ae2eabf0f..741f3dfaa5a 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 = {