Patchwork net: CONFIG_COMPAT redux

login
register
mail settings
Submitter Alexey Dobriyan
Date Feb. 1, 2010, 7:44 p.m.
Message ID <20100201194418.GB21315@x200>
Download mbox | patch
Permalink /patch/44223/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alexey Dobriyan - Feb. 1, 2010, 7:44 p.m.
Ifdef out
	struct proto_ops::compat_ioctl
	struct proto_ops::compat_setsockopt
	struct proto_ops::compat_getsockopt
to make structures smaller on COMPAT=n kernels.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 include/linux/net.h |    4 ++++
 1 file changed, 4 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 4, 2010, 4:32 a.m.
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 1 Feb 2010 21:44:19 +0200

> Ifdef out
> 	struct proto_ops::compat_ioctl
> 	struct proto_ops::compat_setsockopt
> 	struct proto_ops::compat_getsockopt
> to make structures smaller on COMPAT=n kernels.
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -174,18 +174,22 @@  struct proto_ops {
 				      struct poll_table_struct *wait);
 	int		(*ioctl)     (struct socket *sock, unsigned int cmd,
 				      unsigned long arg);
+#ifdef CONFIG_COMPAT
 	int	 	(*compat_ioctl) (struct socket *sock, unsigned int cmd,
 				      unsigned long arg);
+#endif
 	int		(*listen)    (struct socket *sock, int len);
 	int		(*shutdown)  (struct socket *sock, int flags);
 	int		(*setsockopt)(struct socket *sock, int level,
 				      int optname, char __user *optval, unsigned int optlen);
 	int		(*getsockopt)(struct socket *sock, int level,
 				      int optname, char __user *optval, int __user *optlen);
+#ifdef CONFIG_COMPAT
 	int		(*compat_setsockopt)(struct socket *sock, int level,
 				      int optname, char __user *optval, unsigned int optlen);
 	int		(*compat_getsockopt)(struct socket *sock, int level,
 				      int optname, char __user *optval, int __user *optlen);
+#endif
 	int		(*sendmsg)   (struct kiocb *iocb, struct socket *sock,
 				      struct msghdr *m, size_t total_len);
 	int		(*recvmsg)   (struct kiocb *iocb, struct socket *sock,