Re: [PATCH net-next-2.6] net: net/socket.c and net/compat.c cleanups

Previous thread: [PATCH net-next-2.6] ipv4: RCU changes in __mkroute_input() by Eric Dumazet on Thursday, June 3, 2010 - 7:13 am. (2 messages)

Next thread: [PATCH net-next-2.6] [PPPOE] fix return value of __pppoe_xmit() method. by Rami Rosen on Thursday, June 3, 2010 - 8:02 am. (2 messages)
From: Eric Dumazet
Date: Thursday, June 3, 2010 - 7:29 am

cleanup patch, to match modern coding style.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 net/compat.c |   47 ++++++-------
 net/socket.c |  165 +++++++++++++++++++++++--------------------------
 2 files changed, 102 insertions(+), 110 deletions(-)

diff --git a/net/compat.c b/net/compat.c
index 1cf7590..63d260e 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -81,7 +81,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
 	int tot_len;
 
 	if (kern_msg->msg_namelen) {
-		if (mode==VERIFY_READ) {
+		if (mode == VERIFY_READ) {
 			int err = move_addr_to_kernel(kern_msg->msg_name,
 						      kern_msg->msg_namelen,
 						      kern_address);
@@ -354,7 +354,7 @@ static int do_set_attach_filter(struct socket *sock, int level, int optname,
 static int do_set_sock_timeout(struct socket *sock, int level,
 		int optname, char __user *optval, unsigned int optlen)
 {
-	struct compat_timeval __user *up = (struct compat_timeval __user *) optval;
+	struct compat_timeval __user *up = (struct compat_timeval __user *)optval;
 	struct timeval ktime;
 	mm_segment_t old_fs;
 	int err;
@@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
 		return -EFAULT;
 	old_fs = get_fs();
 	set_fs(KERNEL_DS);
-	err = sock_setsockopt(sock, level, optname, (char *) &ktime, sizeof(ktime));
+	err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
 	set_fs(old_fs);
 
 	return err;
@@ -389,11 +389,10 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname,
 				char __user *optval, unsigned int optlen)
 {
 	int err;
-	struct socket *sock;
+	struct socket *sock = sockfd_lookup(fd, &err);
 
-	if ((sock = sockfd_lookup(fd, &err))!=NULL)
-	{
-		err = security_socket_setsockopt(sock,level,optname);
+	if (sock) {
+		err = security_socket_setsockopt(sock, level, optname);
 		if (err) {
 			sockfd_put(sock);
 			return err;
@@ -453,7 +452,7 @@ static int compat_sock_getsockopt(struct socket ...
From: David Miller
Date: Thursday, June 3, 2010 - 8:05 pm

From: Eric Dumazet <eric.dumazet@gmail.com>

It's modern, except for that trailing empty newline you added at
EOF of net/socket.c which GIT warns about and I had to fix.

Applied.
--

From: Eric Dumazet
Date: Thursday, June 3, 2010 - 8:36 pm

Oh... thanks for the tip and fix !


--

Previous thread: [PATCH net-next-2.6] ipv4: RCU changes in __mkroute_input() by Eric Dumazet on Thursday, June 3, 2010 - 7:13 am. (2 messages)

Next thread: [PATCH net-next-2.6] [PPPOE] fix return value of __pppoe_xmit() method. by Rami Rosen on Thursday, June 3, 2010 - 8:02 am. (2 messages)