From aeb51d2330da74b70da2aae9e991ef421194bf91 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Sat, 30 Mar 2013 13:31:02 -0500 Subject: [PATCH] --- yaml --- r: 373389 b: refs/heads/master c: 1190bf06a6b033384a65b5acdb1193d41cd257a6 h: refs/heads/master i: 373387: 977797530d1a48e3ad2ca02c64da99bfe85f7d4b v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd1747e9bc8e..a29b2ef6e212 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6644ed7b7e04f8e588aebdaa58cededb9416ab95 +refs/heads/master: 1190bf06a6b033384a65b5acdb1193d41cd257a6 diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index d4e46d8a088c..24f3aba34800 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/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 */