Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[ATALK/DECNET]: Use seq_open_private in appletalk and decnet. 



These two also perform manual seq_open_private, so patch them both at
once. But unlike ATM code, these already use the seq_release_private,
so I splitted this patch from the previous one.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a8c09e7

net/appletalk/aarp.c

+2 −19
Original line number Diff line number Diff line
@@ -1033,25 +1033,8 @@ static const struct seq_operations aarp_seq_ops = { 


static int aarp_seq_open(struct inode *inode, struct file *file)

{

	struct seq_file *seq;

	int rc = -ENOMEM;

	struct aarp_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);



	if (!s)

		goto out;



	rc = seq_open(file, &aarp_seq_ops);

	if (rc)

		goto out_kfree;



	seq	     = file->private_data;

	seq->private = s;

	memset(s, 0, sizeof(*s));

out:

	return rc;

out_kfree:

	kfree(s);

	goto out;

	return seq_open_private(file, &aarp_seq_ops,

			sizeof(struct aarp_iter_state));

}



const struct file_operations atalk_seq_arp_fops = {

net/decnet/af_decnet.c

+2 −19
Original line number Diff line number Diff line
@@ -2320,25 +2320,8 @@ static const struct seq_operations dn_socket_seq_ops = { 


static int dn_socket_seq_open(struct inode *inode, struct file *file)

{

	struct seq_file *seq;

	int rc = -ENOMEM;

	struct dn_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);



	if (!s)

		goto out;



	rc = seq_open(file, &dn_socket_seq_ops);

	if (rc)

		goto out_kfree;



	seq		= file->private_data;

	seq->private	= s;

	memset(s, 0, sizeof(*s));

out:

	return rc;

out_kfree:

	kfree(s);

	goto out;

	return seq_open_private(file, &dn_socket_seq_ops,

			sizeof(struct dn_iter_state));

}



static const struct file_operations dn_socket_seq_fops = {