Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1190bf06 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: fix broken data length assertions 

It's OK for the result of a read to come back with fewer bytes than
were requested.  So don't trigger a BUG() in that case when
initializing the data cursor.

This resolves the first problem described in:
    http://tracker.ceph.com/issues/4598



Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 6644ed7b

net/ceph/messenger.c

+2 −2
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static void ceph_msg_data_pages_cursor_init(struct ceph_msg_data *data, 


	BUG_ON(!data->pages);

	BUG_ON(!data->length);

	BUG_ON(length != data->length);

	BUG_ON(length > data->length);	/* short reads are OK */



	cursor->resid = length;

	page_count = calc_pages_for(data->alignment, (u64)data->length);
@@ -905,7 +905,7 @@ static void ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data *data, 


	pagelist = data->pagelist;

	BUG_ON(!pagelist);

	BUG_ON(length != pagelist->length);

	BUG_ON(length > pagelist->length);	/* short reads are OK */



	if (!length)

		return;		/* pagelist can be assigned but empty */