From: David Howells <dhowells@redhat.com>
Date: Tue, 13 May 2014 16:33:51 +0000 (+0100)
Subject: rxgen: Check call->more_recv instead of checking MSG_MORE in rxrpc_recv_data()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e7facf020724d4caa6f042580dc4f5f4bdc2372d;p=users%2Fdhowells%2Fkafs-utils.git

rxgen: Check call->more_recv instead of checking MSG_MORE in rxrpc_recv_data()

Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/af_rxrpc.c b/af_rxrpc.c
index 91a671c..b4eabe6 100644
--- a/af_rxrpc.c
+++ b/af_rxrpc.c
@@ -701,8 +701,9 @@ loop:
 			if (call->data_count <= 0 && call->more_recv)
 				return 0;
 		} else if (call->data_count < call->need_size) {
-			if (!(msg.msg_flags & MSG_MORE)) {
+			if (!call->more_recv) {
 				/* Short data */
+				debug("SHORT %u < %x\n", call->data_count, call->need_size);
 				call->error_code = ENODATA;
 				rxrpc_abort_call(call, 1);
 			}
@@ -733,7 +734,7 @@ loop:
 	case rx_call_cl_wait_for_no_MSG_MORE:
 	case rx_call_sv_wait_for_no_MSG_MORE:
 		rxgen_dec_discard_excess(call);
-		if (!(msg.msg_flags & MSG_MORE)) {
+		if (!call->more_recv) {
 			call->state++;
 			if (call->state == rx_call_sv_processing) {
 				/* Prepare to encode the response */