From: J. Bruce Fields <bfields@redhat.com>
Date: Sat, 18 Aug 2012 00:32:27 +0000 (-0400)
Subject: svcrpc: minor udp code cleanup
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13847^2~29
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f23abfdb94fda3108441530cb4a813088d3f9176;p=mirror_ubuntu-artful-kernel.git

svcrpc: minor udp code cleanup

Order the code in a more boring way.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index c7a7b14f54ed..06ae8a755349 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -620,10 +620,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
 	if (!svc_udp_get_dest_address(rqstp, cmh)) {
 		net_warn_ratelimited("svc: received unknown control message %d/%d; dropping RPC reply datagram\n",
 				     cmh->cmsg_level, cmh->cmsg_type);
-out_free:
-		trace_kfree_skb(skb, svc_udp_recvfrom);
-		skb_free_datagram_locked(svsk->sk_sk, skb);
-		return 0;
+		goto out_free;
 	}
 	rqstp->rq_daddrlen = svc_addr_len(svc_daddr(rqstp));
 
@@ -662,6 +659,10 @@ out_free:
 		serv->sv_stats->netudpcnt++;
 
 	return len;
+out_free:
+	trace_kfree_skb(skb, svc_udp_recvfrom);
+	skb_free_datagram_locked(svsk->sk_sk, skb);
+	return 0;
 }
 
 static int