aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-30 13:31:02 -0500
committerSage Weil <sage@inktank.com>2013-05-01 21:17:38 -0700
commit1190bf06a6b033384a65b5acdb1193d41cd257a6 (patch)
treedd954da4bce3965e9255218b1908b0a9789d3cb2 /net/ceph/messenger.c
parent6644ed7b7e04f8e588aebdaa58cededb9416ab95 (diff)
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: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index d4e46d8a088c..24f3aba34800 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -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 */

Privacy Policy