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 <><
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
