2019-10-10 03:47:08

by Vito Caputo

Subject: [PATCH] af_unix: __unix_find_socket_byname() cleanup

Remove pointless return variable dance.

Appears vestigial from when the function did locking as seen in
unix_find_socket_byinode(), but locking is handled in
unix_find_socket_byname() for __unix_find_socket_byname().

Signed-off-by: Vito Caputo <[email protected]>
---
net/unix/af_unix.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 67e87db5877f..c853ad0875f4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -284,11 +284,9 @@ static struct sock *__unix_find_socket_byname(struct net *net,

if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
- goto found;
+ return s;
}
- s = NULL;
-found:
- return s;
+ return NULL;
}

static inline struct sock *unix_find_socket_byname(struct net *net,
--
2.11.0

2019-10-12 03:45:32

by David Miller

Subject: Re: [PATCH] af_unix: __unix_find_socket_byname() cleanup

From: Vito Caputo <[email protected]>
Date: Wed, 9 Oct 2019 20:43:47 -0700

> Remove pointless return variable dance.
>
> Appears vestigial from when the function did locking as seen in
> unix_find_socket_byinode(), but locking is handled in
> unix_find_socket_byname() for __unix_find_socket_byname().
>
> Signed-off-by: Vito Caputo <[email protected]>

I agree with your analysis. :-)

Applied to net-next.