Commit 543d9cfe authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[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: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f94691ac

net/core/sock.c

+10 −10
Original line number Diff line number Diff line
@@ -1386,14 +1386,14 @@ int sock_common_getsockopt(struct socket *sock, int level, int optname, 
EXPORT_SYMBOL(sock_common_getsockopt);



#ifdef CONFIG_COMPAT

int compat_sock_common_getsockopt(struct socket *sock, int level,

		int optname, char __user *optval, int __user *optlen)

int compat_sock_common_getsockopt(struct socket *sock, int level, int optname,

				  char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;



	if (sk->sk_prot->compat_setsockopt)

		return sk->sk_prot->compat_getsockopt(sk, level,

			optname, optval, optlen);

	if (sk->sk_prot->compat_setsockopt != NULL)

		return sk->sk_prot->compat_getsockopt(sk, level, optname,

						      optval, optlen);

	return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(compat_sock_common_getsockopt);
@@ -1429,14 +1429,14 @@ int sock_common_setsockopt(struct socket *sock, int level, int optname, 
EXPORT_SYMBOL(sock_common_setsockopt);



#ifdef CONFIG_COMPAT

int compat_sock_common_setsockopt(struct socket *sock,

		int level, int optname, char __user *optval, int optlen)

int compat_sock_common_setsockopt(struct socket *sock, int level, int optname,

				  char __user *optval, int optlen)

{

	struct sock *sk = sock->sk;



	if (sk->sk_prot->compat_setsockopt)

		return sk->sk_prot->compat_setsockopt(sk, level,

			optname, optval, optlen);

	if (sk->sk_prot->compat_setsockopt != NULL)

		return sk->sk_prot->compat_setsockopt(sk, level, optname,

						      optval, optlen);

	return sk->sk_prot->setsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(compat_sock_common_setsockopt);

net/dccp/ipv4.c

+36 −36
Original line number Diff line number Diff line
@@ -994,12 +994,12 @@ static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { 
	.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,

#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 = {
@@ -1087,14 +1087,14 @@ static const struct proto_ops inet_dccp_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

#ifdef CONFIG_COMPAT

	.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,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

};



static struct inet_protosw dccp_v4_protosw = {

net/dccp/ipv6.c

+69 −69
Original line number Diff line number Diff line
@@ -1114,12 +1114,12 @@ static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = { 
	.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,

#endif

	.addr2sockaddr	= inet6_csk_addr2sockaddr,

	.sockaddr_len	= sizeof(struct sockaddr_in6)

};



/*
@@ -1134,12 +1134,12 @@ static struct inet_connection_sock_af_ops dccp_ipv6_mapped = { 
	.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,

#endif

	.addr2sockaddr	= inet6_csk_addr2sockaddr,

	.sockaddr_len	= sizeof(struct sockaddr_in6)

};



/* NOTE: A lot of things set to zero explicitly by call to
@@ -1175,10 +1175,6 @@ static struct proto dccp_v6_prot = { 
	.init		   = dccp_v6_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_v6_do_rcv,
@@ -1193,6 +1189,10 @@ static struct proto dccp_v6_prot = { 
	.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,

#endif

};



static struct inet6_protocol dccp_v6_protocol = {
@@ -1216,14 +1216,14 @@ static struct proto_ops inet6_dccp_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

#ifdef CONFIG_COMPAT

	.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,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

};



static struct inet_protosw dccp_v6_protosw = {

net/dccp/proto.c

+6 −3
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ 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
@@ -525,9 +526,9 @@ int compat_dccp_setsockopt(struct sock *sk, int level, int optname, 
	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,6 +610,7 @@ 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
@@ -620,6 +622,7 @@ int compat_dccp_getsockopt(struct sock *sk, int level, int optname, 
						  optval, optlen);

	return do_dccp_getsockopt(sk, level, optname, optval, optlen);

}



EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);

#endif

net/ipv4/af_inet.c

+60 −60
Original line number Diff line number Diff line
@@ -802,14 +802,14 @@ const struct proto_ops inet_stream_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

	.sendmsg	   = inet_sendmsg,

	.recvmsg	   = sock_common_recvmsg,

	.mmap		   = sock_no_mmap,

	.sendpage	   = tcp_sendpage,

#ifdef CONFIG_COMPAT

	.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 =	tcp_sendpage

};



const struct proto_ops inet_dgram_ops = {
@@ -827,14 +827,14 @@ const struct proto_ops inet_dgram_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

#ifdef CONFIG_COMPAT

	.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	   = inet_sendpage,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

};



/*
@@ -856,14 +856,14 @@ static const struct proto_ops inet_sockraw_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

#ifdef CONFIG_COMPAT

	.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	   = inet_sendpage,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

};



static struct net_proto_family inet_family_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE