* [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet.
@ 2008-02-29 13:48 Pavel Emelyanov
2008-02-29 14:10 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Emelyanov @ 2008-02-29 13:48 UTC (permalink / raw)
To: David Miller
Cc: Linux Netdev List, Arnaldo Carvalho de Melo, Christine Caulfield
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>
---
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 18058bb..61166f6 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 acd48ee..23fd95a 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 = {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet.
2008-02-29 13:48 [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet Pavel Emelyanov
@ 2008-02-29 14:10 ` Arnaldo Carvalho de Melo
2008-02-29 19:38 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2008-02-29 14:10 UTC (permalink / raw)
To: Pavel Emelyanov; +Cc: David Miller, Linux Netdev List, Christine Caulfield
Em Fri, Feb 29, 2008 at 04:48:24PM +0300, Pavel Emelyanov escreveu:
> 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>
> ---
>
> diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
> index 18058bb..61166f6 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 acd48ee..23fd95a 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 = {
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet.
2008-02-29 14:10 ` Arnaldo Carvalho de Melo
@ 2008-02-29 19:38 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-02-29 19:38 UTC (permalink / raw)
To: acme; +Cc: xemul, netdev, christine.caulfield
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 29 Feb 2008 11:10:59 -0300
> Em Fri, Feb 29, 2008 at 04:48:24PM +0300, Pavel Emelyanov escreveu:
> > 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-02-29 19:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-29 13:48 [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet Pavel Emelyanov
2008-02-29 14:10 ` Arnaldo Carvalho de Melo
2008-02-29 19:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).