Skip to content

Commit 772476d

Browse files
Rob Jonesummakynes
authored andcommitted
net/netfilter/x_tables.c: use __seq_open_private()
Reduce boilerplate code by using __seq_open_private() instead of seq_open() in xt_match_open() and xt_target_open(). Signed-off-by: Rob Jones <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 84d7fce commit 772476d

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

net/netfilter/x_tables.c

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,22 +1101,11 @@ static const struct seq_operations xt_match_seq_ops = {
11011101

11021102
static int xt_match_open(struct inode *inode, struct file *file)
11031103
{
1104-
struct seq_file *seq;
11051104
struct nf_mttg_trav *trav;
1106-
int ret;
1107-
1108-
trav = kmalloc(sizeof(*trav), GFP_KERNEL);
1109-
if (trav == NULL)
1105+
trav = __seq_open_private(file, &xt_match_seq_ops, sizeof(*trav));
1106+
if (!trav)
11101107
return -ENOMEM;
11111108

1112-
ret = seq_open(file, &xt_match_seq_ops);
1113-
if (ret < 0) {
1114-
kfree(trav);
1115-
return ret;
1116-
}
1117-
1118-
seq = file->private_data;
1119-
seq->private = trav;
11201109
trav->nfproto = (unsigned long)PDE_DATA(inode);
11211110
return 0;
11221111
}
@@ -1165,22 +1154,11 @@ static const struct seq_operations xt_target_seq_ops = {
11651154

11661155
static int xt_target_open(struct inode *inode, struct file *file)
11671156
{
1168-
struct seq_file *seq;
11691157
struct nf_mttg_trav *trav;
1170-
int ret;
1171-
1172-
trav = kmalloc(sizeof(*trav), GFP_KERNEL);
1173-
if (trav == NULL)
1158+
trav = __seq_open_private(file, &xt_target_seq_ops, sizeof(*trav));
1159+
if (!trav)
11741160
return -ENOMEM;
11751161

1176-
ret = seq_open(file, &xt_target_seq_ops);
1177-
if (ret < 0) {
1178-
kfree(trav);
1179-
return ret;
1180-
}
1181-
1182-
seq = file->private_data;
1183-
seq->private = trav;
11841162
trav->nfproto = (unsigned long)PDE_DATA(inode);
11851163
return 0;
11861164
}

0 commit comments

Comments
 (0)