Commit 61fcdc97 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

libceph: no outbound zero data

There is handling in write_partial_message_data() for the case where
only the length of--and no other information about--the data to be
sent has been specified.  It uses the zero page as the source of
data to send in this case.

This case doesn't occur.  All message senders set up a page array,
pagelist, or bio describing the data to be sent.  So eliminate the
block of code that handles this (but check and issue a warning for
now, just in case it happens for some reason).

This resolves:
    http://tracker.ceph.com/issues/4426Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 878efabd
......@@ -1512,13 +1512,10 @@ static int write_partial_message_data(struct ceph_connection *con)
&length, &last_piece);
#endif
} else {
size_t resid = data_len - msg_pos->data_pos;
page = zero_page;
page_offset = msg_pos->page_pos;
length = PAGE_SIZE - page_offset;
length = min(resid, length);
last_piece = length == resid;
WARN(1, "con %p data_len %u but no outbound data\n",
con, data_len);
ret = -EINVAL;
goto out;
}
if (do_datacrc && !msg_pos->did_page_crc) {
u32 crc = le32_to_cpu(msg->footer.data_crc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment