[tipc-discussion] [PATCH net-next v2 09/10] tipc: add common unwind section to reduce duplicated code

[Ying X. <yin...@wi...>]

A trivial optimization is made for tipc_disc_recv_msg() by adding a
common unwind section to reduce duplicated code.

Signed-off-by: Ying Xue <yin...@wi...>
---
 net/tipc/discover.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index d8b49fb..8f86fcf 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -199,8 +199,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
 			/* delayed rediscovery */
 		} else {
 			disc_dupl_alert(b_ptr, orig, &media_addr);
-			tipc_node_unlock(n_ptr);
-			return;
+			goto exit;
 		}
 		n_ptr->signature = signature;
 	}
@@ -218,8 +217,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
 	if (addr_mismatch) {
 		if (tipc_link_is_up(link)) {
 			disc_dupl_alert(b_ptr, orig, &media_addr);
-			tipc_node_unlock(n_ptr);
-			return;
+			goto exit;
 		} else {
 			memcpy(&link->media_addr, &media_addr,
 			       sizeof(media_addr));
@@ -230,10 +228,8 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
 	/* Create a link endpoint for this bearer, if necessary */
 	if (!link) {
 		link = tipc_link_create(n_ptr, b_ptr, &media_addr);
-		if (!link) {
-			tipc_node_unlock(n_ptr);
-			return;
-		}
+		if (!link)
+			goto exit;
 	}
 
 	/* Accept discovery message & send response, if necessary */
@@ -247,7 +243,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
 			kfree_skb(rbuf);
 		}
 	}
-
+exit:
 	tipc_node_unlock(n_ptr);
 }
 
-- 
1.7.9.5