aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/svcsock.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-08-17 20:32:27 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-08-21 17:07:50 -0400
commitf23abfdb94fda3108441530cb4a813088d3f9176 (patch)
tree31ae521555cb313a168e6adc304121cf39f0ac00 /net/sunrpc/svcsock.c
parentnfsd: allow configuring nfsd to listen on 5-digit ports (diff)
downloadlinux-dev-f23abfdb94fda3108441530cb4a813088d3f9176.tar.xz
linux-dev-f23abfdb94fda3108441530cb4a813088d3f9176.zip
svcrpc: minor udp code cleanup
Order the code in a more boring way. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r--net/sunrpc/svcsock.c9
1 files changed, 5 insertions, 4 deletions
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