Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / net / netfilter / x_tables.c

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 272ae4d6fdf4f1dcb27eb2bc6e68414a25b63363..133eb4772f12586d31b4b95aa45202318753d848 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1101,22 +1101,11 @@ static const struct seq_operations xt_match_seq_ops = {
 
 static int xt_match_open(struct inode *inode, struct file *file)
 {
-       struct seq_file *seq;
        struct nf_mttg_trav *trav;
-       int ret;
-
-       trav = kmalloc(sizeof(*trav), GFP_KERNEL);
-       if (trav == NULL)
+       trav = __seq_open_private(file, &xt_match_seq_ops, sizeof(*trav));
+       if (!trav)
                return -ENOMEM;
 
-       ret = seq_open(file, &xt_match_seq_ops);
-       if (ret < 0) {
-               kfree(trav);
-               return ret;
-       }
-
-       seq = file->private_data;
-       seq->private = trav;
        trav->nfproto = (unsigned long)PDE_DATA(inode);
        return 0;
 }
@@ -1165,22 +1154,11 @@ static const struct seq_operations xt_target_seq_ops = {
 
 static int xt_target_open(struct inode *inode, struct file *file)
 {
-       struct seq_file *seq;
        struct nf_mttg_trav *trav;
-       int ret;
-
-       trav = kmalloc(sizeof(*trav), GFP_KERNEL);
-       if (trav == NULL)
+       trav = __seq_open_private(file, &xt_target_seq_ops, sizeof(*trav));
+       if (!trav)
                return -ENOMEM;
 
-       ret = seq_open(file, &xt_target_seq_ops);
-       if (ret < 0) {
-               kfree(trav);
-               return ret;
-       }
-
-       seq = file->private_data;
-       seq->private = trav;
        trav->nfproto = (unsigned long)PDE_DATA(inode);
        return 0;
 }