af_unix: __unix_find_socket_byname() cleanup
diff mbox series

Message ID 20191010034347.ohjmoivd7f426znd@shells.gnugeneration.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • af_unix: __unix_find_socket_byname() cleanup
Related show

Commit Message

Vito Caputo Oct. 10, 2019, 3:43 a.m. UTC
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 <vcaputo@pengaru.com>
---
 net/unix/af_unix.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

David Miller Oct. 12, 2019, 3:40 a.m. UTC | #1
From: Vito Caputo <vcaputo@pengaru.com>
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 <vcaputo@pengaru.com>

I agree with your analysis. :-)

Applied to net-next.

Patch
diff mbox series

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,