2019-10-10 04:09:01

by Vito Caputo

Subject: [PATCH] sock_get_timeout: drop unnecessary return variable

Remove pointless use of size return variable by directly returning
sizes.

Signed-off-by: Vito Caputo <[email protected]>
---
net/core/sock.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index fac2b4d80de5..e01ff0d3be95 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -333,7 +333,6 @@ EXPORT_SYMBOL(__sk_backlog_rcv);
static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
{
struct __kernel_sock_timeval tv;
- int size;

if (timeo == MAX_SCHEDULE_TIMEOUT) {
tv.tv_sec = 0;
@@ -354,13 +353,11 @@ static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
old_tv.tv_sec = tv.tv_sec;
old_tv.tv_usec = tv.tv_usec;
*(struct __kernel_old_timeval *)optval = old_tv;
- size = sizeof(old_tv);
- } else {
- *(struct __kernel_sock_timeval *)optval = tv;
- size = sizeof(tv);
+ return sizeof(old_tv);
}

- return size;
+ *(struct __kernel_sock_timeval *)optval = tv;
+ return sizeof(tv);
}

static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen, bool old_timeval)
--
2.11.0

2019-10-12 03:47:00

by David Miller

Subject: Re: [PATCH] sock_get_timeout: drop unnecessary return variable

From: Vito Caputo <[email protected]>
Date: Wed, 9 Oct 2019 21:08:24 -0700

> Remove pointless use of size return variable by directly returning
> sizes.
>
> Signed-off-by: Vito Caputo <[email protected]>

Looks good, applied to net-next.