From: Arnaldo Carvalho de Melo <acme@redhat.com>
To: Pavel Emelyanov <xemul@openvz.org>
Cc: David Miller <davem@davemloft.net>,
Linux Netdev List <netdev@vger.kernel.org>,
Christine Caulfield <christine.caulfield@googlemail.com>
Subject: Re: [PATCH net-2.6.26 3/4] Use seq_open_private in appletalk and decnet.
Date: Fri, 29 Feb 2008 11:10:59 -0300 [thread overview]
Message-ID: <20080229141059.GK4306@ghostprotocols.net> (raw)
In-Reply-To: <47C80D28.9020009@openvz.org>
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 = {
>
next prev parent reply other threads:[~2008-02-29 14:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2008-02-29 19:38 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080229141059.GK4306@ghostprotocols.net \
--to=acme@redhat.com \
--cc=christine.caulfield@googlemail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=xemul@openvz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).