[NET]: Identation & other cleanups related to compat_[gs]etsockopt cset

No code changes, just tidying up, in some cases moving EXPORT_SYMBOLs
to just after the function exported, etc.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 111 insertions, 108 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 8a33c8498d9c..29047995c695 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -986,20 +986,20 @@ do_time_wait:
 }
 
 static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = {
-        .queue_xmit     = ip_queue_xmit,
-        .send_check     = dccp_v4_send_check,
-        .rebuild_header = inet_sk_rebuild_header,
-        .conn_request   = dccp_v4_conn_request,
-        .syn_recv_sock  = dccp_v4_request_recv_sock,
-        .net_header_len = sizeof(struct iphdr),
-        .setsockopt     = ip_setsockopt,
-        .getsockopt     = ip_getsockopt,
+        .queue_xmit        = ip_queue_xmit,
+        .send_check        = dccp_v4_send_check,
+        .rebuild_header    = inet_sk_rebuild_header,
+        .conn_request      = dccp_v4_conn_request,
+        .syn_recv_sock     = dccp_v4_request_recv_sock,
+        .net_header_len    = sizeof(struct iphdr),
+        .setsockopt        = ip_setsockopt,
+        .getsockopt        = ip_getsockopt,
+        .addr2sockaddr     = inet_csk_addr2sockaddr,
+        .sockaddr_len      = sizeof(struct sockaddr_in),
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_ip_setsockopt,
-        .compat_getsockopt      = compat_ip_getsockopt,
+        .compat_setsockopt = compat_ip_setsockopt,
+        .compat_getsockopt = compat_ip_getsockopt,
 #endif
-        .addr2sockaddr  = inet_csk_addr2sockaddr,
-        .sockaddr_len   = sizeof(struct sockaddr_in),
 };
 
 static int dccp_v4_init_sock(struct sock *sk)
@@ -1044,10 +1044,6 @@ static struct proto dccp_v4_prot = {
         .init                   = dccp_v4_init_sock,
         .setsockopt             = dccp_setsockopt,
         .getsockopt             = dccp_getsockopt,
-#ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_dccp_setsockopt,
-        .compat_getsockopt      = compat_dccp_getsockopt,
-#endif
         .sendmsg                = dccp_sendmsg,
         .recvmsg                = dccp_recvmsg,
         .backlog_rcv            = dccp_v4_do_rcv,
@@ -1062,6 +1058,10 @@ static struct proto dccp_v4_prot = {
         .obj_size               = sizeof(struct dccp_sock),
         .rsk_prot               = &dccp_request_sock_ops,
         .twsk_prot              = &dccp_timewait_sock_ops,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_dccp_setsockopt,
+        .compat_getsockopt      = compat_dccp_getsockopt,
+#endif
 };
 
 static struct net_protocol dccp_v4_protocol = {
@@ -1071,30 +1071,30 @@ static struct net_protocol dccp_v4_protocol = {
 };
 
 static const struct proto_ops inet_dccp_ops = {
-        .family         = PF_INET,
-        .owner          = THIS_MODULE,
-        .release        = inet_release,
-        .bind           = inet_bind,
-        .connect        = inet_stream_connect,
-        .socketpair     = sock_no_socketpair,
-        .accept         = inet_accept,
-        .getname        = inet_getname,
+        .family            = PF_INET,
+        .owner             = THIS_MODULE,
+        .release           = inet_release,
+        .bind              = inet_bind,
+        .connect           = inet_stream_connect,
+        .socketpair        = sock_no_socketpair,
+        .accept            = inet_accept,
+        .getname           = inet_getname,
         /* FIXME: work on tcp_poll to rename it to inet_csk_poll */
-        .poll           = dccp_poll,
-        .ioctl          = inet_ioctl,
+        .poll              = dccp_poll,
+        .ioctl             = inet_ioctl,
         /* FIXME: work on inet_listen to rename it to sock_common_listen */
-        .listen         = inet_dccp_listen,
-        .shutdown       = inet_shutdown,
-        .setsockopt     = sock_common_setsockopt,
-        .getsockopt     = sock_common_getsockopt,
+        .listen            = inet_dccp_listen,
+        .shutdown          = inet_shutdown,
+        .setsockopt        = sock_common_setsockopt,
+        .getsockopt        = sock_common_getsockopt,
+        .sendmsg           = inet_sendmsg,
+        .recvmsg           = sock_common_recvmsg,
+        .mmap              = sock_no_mmap,
+        .sendpage          = sock_no_sendpage,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_sock_common_setsockopt,
-        .compat_getsockopt      = compat_sock_common_getsockopt,
+        .compat_setsockopt = compat_sock_common_setsockopt,
+        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
-        .sendmsg        = inet_sendmsg,
-        .recvmsg        = sock_common_recvmsg,
-        .mmap           = sock_no_mmap,
-        .sendpage       = sock_no_sendpage,
 };
 
 static struct inet_protosw dccp_v4_protosw = {
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 89106c7d3247..65e2ab0886e6 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1106,40 +1106,40 @@ do_time_wait:
 }
 
 static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = {
-        .queue_xmit     = inet6_csk_xmit,
-        .send_check     = dccp_v6_send_check,
-        .rebuild_header = inet6_sk_rebuild_header,
-        .conn_request   = dccp_v6_conn_request,
-        .syn_recv_sock  = dccp_v6_request_recv_sock,
-        .net_header_len = sizeof(struct ipv6hdr),
-        .setsockopt     = ipv6_setsockopt,
-        .getsockopt     = ipv6_getsockopt,
+        .queue_xmit        = inet6_csk_xmit,
+        .send_check        = dccp_v6_send_check,
+        .rebuild_header    = inet6_sk_rebuild_header,
+        .conn_request      = dccp_v6_conn_request,
+        .syn_recv_sock     = dccp_v6_request_recv_sock,
+        .net_header_len    = sizeof(struct ipv6hdr),
+        .setsockopt        = ipv6_setsockopt,
+        .getsockopt        = ipv6_getsockopt,
+        .addr2sockaddr     = inet6_csk_addr2sockaddr,
+        .sockaddr_len      = sizeof(struct sockaddr_in6),
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_ipv6_setsockopt,
-        .compat_getsockopt      = compat_ipv6_getsockopt,
+        .compat_setsockopt = compat_ipv6_setsockopt,
+        .compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-        .addr2sockaddr  = inet6_csk_addr2sockaddr,
-        .sockaddr_len   = sizeof(struct sockaddr_in6)
 };
 
 /*
  *      DCCP over IPv4 via INET6 API
  */
 static struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
-        .queue_xmit     = ip_queue_xmit,
-        .send_check     = dccp_v4_send_check,
-        .rebuild_header = inet_sk_rebuild_header,
-        .conn_request   = dccp_v6_conn_request,
-        .syn_recv_sock  = dccp_v6_request_recv_sock,
-        .net_header_len = sizeof(struct iphdr),
-        .setsockopt     = ipv6_setsockopt,
-        .getsockopt     = ipv6_getsockopt,
+        .queue_xmit        = ip_queue_xmit,
+        .send_check        = dccp_v4_send_check,
+        .rebuild_header    = inet_sk_rebuild_header,
+        .conn_request      = dccp_v6_conn_request,
+        .syn_recv_sock     = dccp_v6_request_recv_sock,
+        .net_header_len    = sizeof(struct iphdr),
+        .setsockopt        = ipv6_setsockopt,
+        .getsockopt        = ipv6_getsockopt,
+        .addr2sockaddr     = inet6_csk_addr2sockaddr,
+        .sockaddr_len      = sizeof(struct sockaddr_in6),
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_ipv6_setsockopt,
-        .compat_getsockopt      = compat_ipv6_getsockopt,
+        .compat_setsockopt = compat_ipv6_setsockopt,
+        .compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-        .addr2sockaddr  = inet6_csk_addr2sockaddr,
-        .sockaddr_len   = sizeof(struct sockaddr_in6)
 };
 
 /* NOTE: A lot of things set to zero explicitly by call to
@@ -1166,33 +1166,33 @@ static int dccp_v6_destroy_sock(struct sock *sk)
 }
 
 static struct proto dccp_v6_prot = {
-        .name           = "DCCPv6",
-        .owner          = THIS_MODULE,
-        .close          = dccp_close,
-        .connect        = dccp_v6_connect,
-        .disconnect     = dccp_disconnect,
-        .ioctl          = dccp_ioctl,
-        .init           = dccp_v6_init_sock,
-        .setsockopt     = dccp_setsockopt,
-        .getsockopt     = dccp_getsockopt,
+        .name              = "DCCPv6",
+        .owner             = THIS_MODULE,
+        .close             = dccp_close,
+        .connect           = dccp_v6_connect,
+        .disconnect        = dccp_disconnect,
+        .ioctl             = dccp_ioctl,
+        .init              = dccp_v6_init_sock,
+        .setsockopt        = dccp_setsockopt,
+        .getsockopt        = dccp_getsockopt,
+        .sendmsg           = dccp_sendmsg,
+        .recvmsg           = dccp_recvmsg,
+        .backlog_rcv       = dccp_v6_do_rcv,
+        .hash              = dccp_v6_hash,
+        .unhash            = dccp_unhash,
+        .accept            = inet_csk_accept,
+        .get_port          = dccp_v6_get_port,
+        .shutdown          = dccp_shutdown,
+        .destroy           = dccp_v6_destroy_sock,
+        .orphan_count      = &dccp_orphan_count,
+        .max_header        = MAX_DCCP_HEADER,
+        .obj_size          = sizeof(struct dccp6_sock),
+        .rsk_prot          = &dccp6_request_sock_ops,
+        .twsk_prot         = &dccp6_timewait_sock_ops,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_dccp_setsockopt,
-        .compat_getsockopt      = compat_dccp_getsockopt,
+        .compat_setsockopt = compat_dccp_setsockopt,
+        .compat_getsockopt = compat_dccp_getsockopt,
 #endif
-        .sendmsg        = dccp_sendmsg,
-        .recvmsg        = dccp_recvmsg,
-        .backlog_rcv    = dccp_v6_do_rcv,
-        .hash           = dccp_v6_hash,
-        .unhash         = dccp_unhash,
-        .accept         = inet_csk_accept,
-        .get_port       = dccp_v6_get_port,
-        .shutdown       = dccp_shutdown,
-        .destroy        = dccp_v6_destroy_sock,
-        .orphan_count   = &dccp_orphan_count,
-        .max_header     = MAX_DCCP_HEADER,
-        .obj_size       = sizeof(struct dccp6_sock),
-        .rsk_prot       = &dccp6_request_sock_ops,
-        .twsk_prot      = &dccp6_timewait_sock_ops,
 };
 
 static struct inet6_protocol dccp_v6_protocol = {
@@ -1202,28 +1202,28 @@ static struct inet6_protocol dccp_v6_protocol = {
 };
 
 static struct proto_ops inet6_dccp_ops = {
-        .family         = PF_INET6,
-        .owner          = THIS_MODULE,
-        .release        = inet6_release,
-        .bind           = inet6_bind,
-        .connect        = inet_stream_connect,
-        .socketpair     = sock_no_socketpair,
-        .accept         = inet_accept,
-        .getname        = inet6_getname,
-        .poll           = dccp_poll,
-        .ioctl          = inet6_ioctl,
-        .listen         = inet_dccp_listen,
-        .shutdown       = inet_shutdown,
-        .setsockopt     = sock_common_setsockopt,
-        .getsockopt     = sock_common_getsockopt,
+        .family            = PF_INET6,
+        .owner             = THIS_MODULE,
+        .release           = inet6_release,
+        .bind              = inet6_bind,
+        .connect           = inet_stream_connect,
+        .socketpair        = sock_no_socketpair,
+        .accept            = inet_accept,
+        .getname           = inet6_getname,
+        .poll              = dccp_poll,
+        .ioctl             = inet6_ioctl,
+        .listen            = inet_dccp_listen,
+        .shutdown          = inet_shutdown,
+        .setsockopt        = sock_common_setsockopt,
+        .getsockopt        = sock_common_getsockopt,
+        .sendmsg           = inet_sendmsg,
+        .recvmsg           = sock_common_recvmsg,
+        .mmap              = sock_no_mmap,
+        .sendpage          = sock_no_sendpage,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_sock_common_setsockopt,
-        .compat_getsockopt      = compat_sock_common_getsockopt,
+        .compat_setsockopt = compat_sock_common_setsockopt,
+        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
-        .sendmsg        = inet_sendmsg,
-        .recvmsg        = sock_common_recvmsg,
-        .mmap           = sock_no_mmap,
-        .sendpage       = sock_no_sendpage,
 };
 
 static struct inet_protosw dccp_v6_protosw = {
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 6d7aef9647de..8a6d0a83047c 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -516,18 +516,19 @@ int dccp_setsockopt(struct sock *sk, int level, int optname,
                                                              optlen);
         return do_dccp_setsockopt(sk, level, optname, optval, optlen);
 }
+
 EXPORT_SYMBOL_GPL(dccp_setsockopt);
 
 #ifdef CONFIG_COMPAT
 int compat_dccp_setsockopt(struct sock *sk, int level, int optname,
-                    char __user *optval, int optlen)
+                           char __user *optval, int optlen)
 {
         if (level != SOL_DCCP)
                 return inet_csk_compat_setsockopt(sk, level, optname,
                                                   optval, optlen);
-
         return do_dccp_setsockopt(sk, level, optname, optval, optlen);
 }
+
 EXPORT_SYMBOL_GPL(compat_dccp_setsockopt);
 #endif
 
@@ -609,17 +610,19 @@ int dccp_getsockopt(struct sock *sk, int level, int optname,
                                                              optlen);
         return do_dccp_getsockopt(sk, level, optname, optval, optlen);
 }
+
 EXPORT_SYMBOL_GPL(dccp_getsockopt);
 
 #ifdef CONFIG_COMPAT
 int compat_dccp_getsockopt(struct sock *sk, int level, int optname,
-                    char __user *optval, int __user *optlen)
+                           char __user *optval, int __user *optlen)
 {
         if (level != SOL_DCCP)
                 return inet_csk_compat_getsockopt(sk, level, optname,
                                                   optval, optlen);
         return do_dccp_getsockopt(sk, level, optname, optval, optlen);
 }
+
 EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);
 #endif