]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kclient: fix out_more business
authorSage Weil <sage@newdream.net>
Tue, 17 Mar 2009 02:51:18 +0000 (19:51 -0700)
committerSage Weil <sage@newdream.net>
Tue, 17 Mar 2009 02:51:18 +0000 (19:51 -0700)
Put it in prepare_write_message_footer() where it belongs.

src/kernel/messenger.c

index da2ec3a030df14d6b0b65b4d5299af8d697158af..deada6273a4de092a341f65de724b5040361d896 100644 (file)
@@ -635,8 +635,8 @@ static void prepare_write_message_footer(struct ceph_connection *con, int v)
        con->out_kvec[v].iov_len = sizeof(m->footer);
        con->out_kvec_bytes += sizeof(m->footer);
        con->out_kvec_left++;
+       con->out_more = m->more_to_follow;
        con->out_msg = NULL;   /* we're done with this one */
-       con->out_more = 0;     /* end of message */
 }
 
 /*
@@ -705,7 +705,6 @@ static void prepare_write_message(struct ceph_connection *con)
        } else {
                /* no, queue up footer too and be done */
                prepare_write_message_footer(con, v);
-               con->out_more = con->out_msg->more_to_follow;
        }
 
        set_bit(WRITE_PENDING, &con->state);