From: Arnd Bergmann <arnd@arndb.de>
To: spereira@tusc.com.au
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Andi Kleen <ak@muc.de>,
linux-kenel <linux-kernel@vger.kernel.org>,
x25 maintainer <eis@baty.hanse.de>,
netdev <netdev@vger.kernel.org>, SP <pereira.shaun@gmail.com>
Subject: Re: [PATCH 1/2 RESEND- 2.6.15] net: 32 bit (socket layer) ioctl emulation for 64 bit kernels
Date: Tue, 10 Jan 2006 12:03:58 +0000 [thread overview]
Message-ID: <200601101203.59423.arnd@arndb.de> (raw)
In-Reply-To: <1136871078.5742.26.camel@spereira05.tusc.com.au>
On Tuesday 10 January 2006 05:31, Shaun Pereira wrote:
> Hi Arnd, Arnaldo
> Thanks for your comments. I initially did not wish to change any of the
> other modules, but based on Arnd's comments I have removed the
> extra macro, SOCKOPS_COMPAT_WRAP and use the original SOCKOPS_WRAP.
Ok, looks better now. Just a few tiny style comments:
> +++ linux-2.6.15/net/appletalk/ddp.c 2006-01-10 15:56:55.000000000 +1100
> @@ -1852,6 +1852,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = atalk_getname,
> .poll = datagram_poll,
> .ioctl = atalk_ioctl,
> + .compat_ioctl = NULL,
> .listen = sock_no_listen,
> .shutdown = sock_no_shutdown,
> .setsockopt = sock_no_setsockopt,
No need to set .compat_ioctl to NULL, that's what it already is when you
don't assign it at all. Leaving it out makes it easier to grep for users.
> @@ -709,6 +710,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = econet_getname,
> .poll = datagram_poll,
> .ioctl = econet_ioctl,
> + .compat_ioctl= NULL,
> .listen = sock_no_listen,
> .shutdown = sock_no_shutdown,
> .setsockopt = sock_no_setsockopt,
> diff -uprN -X dontdiff linux-2.6.15-vanilla/net/ipx/af_ipx.c
> linux-2.6.15/net/ipx/af_ipx.c
> --- linux-2.6.15-vanilla/net/ipx/af_ipx.c 2006-01-03 14:21:10.000000000
> +1100
> +++ linux-2.6.15/net/ipx/af_ipx.c 2006-01-10 15:56:55.000000000 +1100
> @@ -1912,6 +1912,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = ipx_getname,
> .poll = datagram_poll,
> .ioctl = ipx_ioctl,
> + .compat_ioctl = NULL,
> .listen = sock_no_listen,
> .shutdown = sock_no_shutdown, /* FIXME: support shutdown */
> .setsockopt = ipx_setsockopt,
> diff -uprN -X dontdiff linux-2.6.15-vanilla/net/irda/af_irda.c
> linux-2.6.15/net/irda/af_irda.c
> --- linux-2.6.15-vanilla/net/irda/af_irda.c 2006-01-03
> 14:21:10.000000000 +1100
> +++ linux-2.6.15/net/irda/af_irda.c 2006-01-10 15:56:55.000000000 +1100
> @@ -2474,6 +2474,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = irda_getname,
> .poll = irda_poll,
> .ioctl = irda_ioctl,
> + .compat_ioctl= NULL,
> .listen = irda_listen,
> .shutdown = irda_shutdown,
> .setsockopt = irda_setsockopt,
> @@ -2495,6 +2496,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = irda_getname,
> .poll = datagram_poll,
> .ioctl = irda_ioctl,
> + .compat_ioctl= NULL,
> .listen = irda_listen,
> .shutdown = irda_shutdown,
> .setsockopt = irda_setsockopt,
> @@ -2516,6 +2518,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = irda_getname,
> .poll = datagram_poll,
> .ioctl = irda_ioctl,
> + .compat_ioctl= NULL,
> .listen = irda_listen,
> .shutdown = irda_shutdown,
> .setsockopt = irda_setsockopt,
> @@ -2538,6 +2541,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = irda_getname,
> .poll = datagram_poll,
> .ioctl = irda_ioctl,
> + .compat_ioctl= NULL,
> .listen = sock_no_listen,
> .shutdown = irda_shutdown,
> .setsockopt = irda_setsockopt,
> static struct proto_ops SOCKOPS_WRAPPED(x25_proto_ops) = {
> .family = AF_X25,
> .owner = THIS_MODULE,
> @@ -1402,6 +1403,7 @@ static struct proto_ops SOCKOPS_WRAPPED(
> .getname = x25_getname,
> .poll = datagram_poll,
> .ioctl = x25_ioctl,
> + .compat_ioctl= NULL,
> .listen = x25_listen,
> .shutdown = sock_no_shutdown,
> .setsockopt = x25_setsockopt,
>
>
Same comment applies to all these.
> +static long compat_sock_ioctl(struct file *file, unsigned cmd, unsigned
> long arg)
> +{
> + struct socket *sock;
> + sock = file->private_data;
> +
> + int ret = -ENOIOCTLCMD;
> + if(sock->ops->compat_ioctl) {
> + ret = sock->ops->compat_ioctl(sock,cmd,arg);
> + }
Leave out the curly braces here and put a space between the function
arguments, so it becomes
+ if(sock->ops->compat_ioctl)
+ ret = sock->ops->compat_ioctl(sock, cmd, arg);
Arnd <><
next prev parent reply other threads:[~2006-01-10 12:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-10 5:31 [PATCH 1/2 RESEND- 2.6.15] net: 32 bit (socket layer) ioctl emulation for 64 bit kernels Shaun Pereira
2006-01-10 12:03 ` Arnd Bergmann [this message]
2006-01-11 6:24 ` 32 bit (socket layer) ioctl emulation for 64 bit kernels - patch1 Shaun Pereira
2006-01-11 12:33 ` Arnd Bergmann
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=200601101203.59423.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=acme@ghostprotocols.net \
--cc=ak@muc.de \
--cc=eis@baty.hanse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pereira.shaun@gmail.com \
--cc=spereira@tusc.com.au \
/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).