diff options
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index f3e93b8eb90f..5bc2f45bddf0 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -1258,8 +1258,8 @@ call_status(struct rpc_task *task) | |||
1258 | struct rpc_rqst *req = task->tk_rqstp; | 1258 | struct rpc_rqst *req = task->tk_rqstp; |
1259 | int status; | 1259 | int status; |
1260 | 1260 | ||
1261 | if (req->rq_received > 0 && !req->rq_bytes_sent) | 1261 | if (req->rq_reply_bytes_recvd > 0 && !req->rq_bytes_sent) |
1262 | task->tk_status = req->rq_received; | 1262 | task->tk_status = req->rq_reply_bytes_recvd; |
1263 | 1263 | ||
1264 | dprint_status(task); | 1264 | dprint_status(task); |
1265 | 1265 | ||
@@ -1376,7 +1376,7 @@ call_decode(struct rpc_task *task) | |||
1376 | 1376 | ||
1377 | /* | 1377 | /* |
1378 | * Ensure that we see all writes made by xprt_complete_rqst() | 1378 | * Ensure that we see all writes made by xprt_complete_rqst() |
1379 | * before it changed req->rq_received. | 1379 | * before it changed req->rq_reply_bytes_recvd. |
1380 | */ | 1380 | */ |
1381 | smp_rmb(); | 1381 | smp_rmb(); |
1382 | req->rq_rcv_buf.len = req->rq_private_buf.len; | 1382 | req->rq_rcv_buf.len = req->rq_private_buf.len; |
@@ -1417,7 +1417,7 @@ out_retry: | |||
1417 | task->tk_status = 0; | 1417 | task->tk_status = 0; |
1418 | /* Note: rpc_verify_header() may have freed the RPC slot */ | 1418 | /* Note: rpc_verify_header() may have freed the RPC slot */ |
1419 | if (task->tk_rqstp == req) { | 1419 | if (task->tk_rqstp == req) { |
1420 | req->rq_received = req->rq_rcv_buf.len = 0; | 1420 | req->rq_reply_bytes_recvd = req->rq_rcv_buf.len = 0; |
1421 | if (task->tk_client->cl_discrtry) | 1421 | if (task->tk_client->cl_discrtry) |
1422 | xprt_conditional_disconnect(task->tk_xprt, | 1422 | xprt_conditional_disconnect(task->tk_xprt, |
1423 | req->rq_connect_cookie); | 1423 | req->rq_connect_cookie); |