Skip to content

Commit

Permalink
[ATALK/DECNET]: Use seq_open_private in appletalk and decnet.
Browse files Browse the repository at this point in the history
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: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Feb 29, 2008
1 parent 9a8c09e commit c20932d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 38 deletions.
21 changes: 2 additions & 19 deletions net/appletalk/aarp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
21 changes: 2 additions & 19 deletions net/decnet/af_decnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit c20932d

Please sign in to comment.