Commit e2da5913 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf7732e4

net/ipv4/netfilter/ipt_recent.c

+2 −13
Original line number Diff line number Diff line
@@ -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,

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+4 −32
Original line number Diff line number Diff line
@@ -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 = {

net/netfilter/nf_conntrack_expect.c

+2 −16
Original line number Diff line number Diff line
@@ -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 = {

net/netfilter/nf_conntrack_standalone.c

+2 −16
Original line number Diff line number Diff line
@@ -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 = {

net/netfilter/nfnetlink_log.c

+2 −16
Original line number Diff line number Diff line
@@ -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 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE