]> www.infradead.org Git - users/dhowells/kafs-utils.git/commitdiff
rxgen: Check call->more_recv instead of checking MSG_MORE in rxrpc_recv_data()
authorDavid Howells <dhowells@redhat.com>
Tue, 13 May 2014 16:33:51 +0000 (17:33 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 13 May 2014 16:33:51 +0000 (17:33 +0100)
Signed-off-by: David Howells <dhowells@redhat.com>
af_rxrpc.c

index 91a671c8a170f9fd0efb5b74d0286f01c2a6b628..b4eabe627a72ec5687783c5f62f01ac7ab2e1fb0 100644 (file)
@@ -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 */