diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-10 05:30:23 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:34 -0400 |
commit | 31164088d72e1420e53f742b6c0c06f7343551dc (patch) | |
tree | f2c5b5964efb1c2da73abc014198d89a5fa345ae | |
parent | e2da59133880976586b2d9d81d798222ecafa566 (diff) |
[DECNET]: Make decnet code use the seq_open_private()
Just switch to the consolidated code.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/decnet/dn_neigh.c | 20 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 19 |
2 files changed, 4 insertions, 35 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index b66e3be3eb84..e851b143cca3 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
@@ -580,24 +580,8 @@ static const struct seq_operations dn_neigh_seq_ops = { | |||
580 | 580 | ||
581 | static int dn_neigh_seq_open(struct inode *inode, struct file *file) | 581 | static int dn_neigh_seq_open(struct inode *inode, struct file *file) |
582 | { | 582 | { |
583 | struct seq_file *seq; | 583 | return seq_open_private(file, &dn_neigh_seq_ops, |
584 | int rc = -ENOMEM; | 584 | sizeof(struct neigh_seq_state)); |
585 | struct neigh_seq_state *s = kzalloc(sizeof(*s), GFP_KERNEL); | ||
586 | |||
587 | if (!s) | ||
588 | goto out; | ||
589 | |||
590 | rc = seq_open(file, &dn_neigh_seq_ops); | ||
591 | if (rc) | ||
592 | goto out_kfree; | ||
593 | |||
594 | seq = file->private_data; | ||
595 | seq->private = s; | ||
596 | out: | ||
597 | return rc; | ||
598 | out_kfree: | ||
599 | kfree(s); | ||
600 | goto out; | ||
601 | } | 585 | } |
602 | 586 | ||
603 | static const struct file_operations dn_neigh_seq_fops = { | 587 | static const struct file_operations dn_neigh_seq_fops = { |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index b7ebf9947ebd..97eee5e8fbbe 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -1739,23 +1739,8 @@ static const struct seq_operations dn_rt_cache_seq_ops = { | |||
1739 | 1739 | ||
1740 | static int dn_rt_cache_seq_open(struct inode *inode, struct file *file) | 1740 | static int dn_rt_cache_seq_open(struct inode *inode, struct file *file) |
1741 | { | 1741 | { |
1742 | struct seq_file *seq; | 1742 | return seq_open_private(file, &dn_rt_cache_seq_ops, |
1743 | int rc = -ENOMEM; | 1743 | sizeof(struct dn_rt_cache_iter_state)); |
1744 | struct dn_rt_cache_iter_state *s; | ||
1745 | |||
1746 | s = kzalloc(sizeof(*s), GFP_KERNEL); | ||
1747 | if (!s) | ||
1748 | goto out; | ||
1749 | rc = seq_open(file, &dn_rt_cache_seq_ops); | ||
1750 | if (rc) | ||
1751 | goto out_kfree; | ||
1752 | seq = file->private_data; | ||
1753 | seq->private = s; | ||
1754 | out: | ||
1755 | return rc; | ||
1756 | out_kfree: | ||
1757 | kfree(s); | ||
1758 | goto out; | ||
1759 | } | 1744 | } |
1760 | 1745 | ||
1761 | static const struct file_operations dn_rt_cache_seq_fops = { | 1746 | static const struct file_operations dn_rt_cache_seq_fops = { |