libceph: distinguish page array and pagelist count

Use distinct fields for tracking the number of pages in a message's
page array and in a message's page list.  Currently only one or the
other is used at a time, but that will be changing soon.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 8297288a66e0..1b08349a413c 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -75,9 +75,10 @@ struct ceph_msg {
         struct kvec front;              /* unaligned blobs of message */
         struct ceph_buffer *middle;
         struct page **pages;            /* data payload.  NOT OWNER. */
-        unsigned nr_pages;              /* size of page array */
+        unsigned page_count;            /* size of page array */
         unsigned page_alignment;        /* io offset in first page */
         struct ceph_pagelist *pagelist; /* instead of pages */
+        unsigned int pagelist_count;    /* number of pages in pagelist */
 
         struct ceph_connection *con;
         struct list_head list_head;