1 files changed, 3 insertions, 5 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index a36d98d8073e..91dd45113c7b 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -913,7 +913,7 @@ ceph_msg_data_pagelist_cursor_init(struct ceph_msg_data_cursor *cursor,
         cursor->resid = min(length, pagelist->length);
         cursor->page = page;
         cursor->offset = 0;
-        cursor->last_piece = length <= PAGE_SIZE;
+        cursor->last_piece = cursor->resid <= PAGE_SIZE;
 }
 
 static struct page *
@@ -1013,8 +1013,6 @@ static void ceph_msg_data_cursor_init(struct ceph_msg *msg, size_t length)
         BUG_ON(length > msg->data_length);
         BUG_ON(list_empty(&msg->data));
 
-        data = list_first_entry(&msg->data, struct ceph_msg_data, links);
-
         cursor->data_head = &msg->data;
         cursor->total_resid = length;
         data = list_first_entry(&msg->data, struct ceph_msg_data, links);
@@ -1088,14 +1086,15 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
                 break;
         }
         cursor->total_resid -= bytes;
-        cursor->need_crc = new_piece;
 
         if (!cursor->resid && cursor->total_resid) {
                 WARN_ON(!cursor->last_piece);
                 BUG_ON(list_is_last(&cursor->data->links, cursor->data_head));
                 cursor->data = list_entry_next(cursor->data, links);
                 __ceph_msg_data_cursor_init(cursor);
+                new_piece = true;
         }
+        cursor->need_crc = new_piece;
 
         return new_piece;
 }
@@ -3019,7 +3018,6 @@ void ceph_msg_data_add_pages(struct ceph_msg *msg, struct page **pages,
         data->length = length;
         data->alignment = alignment & ~PAGE_MASK;
 
-        BUG_ON(!list_empty(&msg->data));
         list_add_tail(&data->links, &msg->data);
         msg->data_length += length;
 }