diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-02-29 11:38:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 11:38:24 -0800 |
| commit | c20932d2c9ba24838a102ac501bf7371b0fe0794 (patch) | |
| tree | 03bfb8c698936f451a267cb5e28d38b482a59add | |
| parent | 9a8c09e73bf6c8b1720b1172cdcabb14fc823cf8 (diff) | |
| download | kernel_samsung_smdk4412-c20932d2c9ba24838a102ac501bf7371b0fe0794.tar.gz kernel_samsung_smdk4412-c20932d2c9ba24838a102ac501bf7371b0fe0794.tar.bz2 kernel_samsung_smdk4412-c20932d2c9ba24838a102ac501bf7371b0fe0794.zip | |
[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: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/appletalk/aarp.c | 21 | ||||
| -rw-r--r-- | net/decnet/af_decnet.c | 21 |
2 files changed, 4 insertions, 38 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 18058bbc796..61166f66479 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -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 = { diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index acd48ee522d..23fd95a7ad1 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -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 = { |