| Message ID | 513FD043.30707@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Josh Durgin <josh.durgin@inktank.com> On 03/12/2013 06:02 PM, Alex Elder wrote: > 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/4426 > > Signed-off-by: Alex Elder <elder@inktank.com> > --- > net/ceph/messenger.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c > index 0d54ca4..c3f2fa1 100644 > --- a/net/ceph/messenger.c > +++ b/net/ceph/messenger.c > @@ -1506,13 +1506,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); > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 0d54ca4..c3f2fa1 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1506,13 +1506,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) {
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/4426 Signed-off-by: Alex Elder <elder@inktank.com> --- net/ceph/messenger.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) u32 crc = le32_to_cpu(msg->footer.data_crc);