From 0a5fcf401bd39b312ccd6901873ed3207598d430 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 17 Aug 2012 21:35:24 -0400 Subject: [PATCH] --- yaml --- r: 334051 b: refs/heads/master c: 9f9d2ebe693a98d517257e1a39f61120b4473b96 h: refs/heads/master i: 334049: 032cfe000e97f892984b9a699795617ba2e0747e 334047: e251f69e3b2160c42d20537e1809e58e506a8e89 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/svc_xprt.c | 2 +- trunk/net/sunrpc/svcsock.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0139bd717063..e7c679c48f10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af6d572134b012ca92c4efc8a2f1cadbe5d01064 +refs/heads/master: 9f9d2ebe693a98d517257e1a39f61120b4473b96 diff --git a/trunk/net/sunrpc/svc_xprt.c b/trunk/net/sunrpc/svc_xprt.c index ee15663798b3..3e317307e288 100644 --- a/trunk/net/sunrpc/svc_xprt.c +++ b/trunk/net/sunrpc/svc_xprt.c @@ -743,7 +743,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) svc_xprt_received(xprt); /* No data, incomplete (TCP) read, or accept() */ - if (len == 0 || len == -EAGAIN) + if (len <= 0) goto out; clear_bit(XPT_OLD, &xprt->xpt_flags); diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c index 406688baac57..7aee54c3fe46 100644 --- a/trunk/net/sunrpc/svcsock.c +++ b/trunk/net/sunrpc/svcsock.c @@ -598,7 +598,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp) dprintk("svc: recvfrom returned error %d\n", -err); set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); } - return -EAGAIN; + return 0; } len = svc_addr_len(svc_addr(rqstp)); rqstp->rq_addrlen = len; @@ -1174,13 +1174,13 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) if (len != -EAGAIN) goto err_other; dprintk("RPC: TCP recvfrom got EAGAIN\n"); - return -EAGAIN; + return 0; err_other: printk(KERN_NOTICE "%s: recvfrom returned errno %d\n", svsk->sk_xprt.xpt_server->sv_name, -len); set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags); err_noclose: - return -EAGAIN; /* record not complete */ + return 0; /* record not complete */ } /*