summaryrefslogtreecommitdiff
path: root/include/linux/ceph
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-26 03:35:46 +0400
committerSage Weil <sage@inktank.com>2013-05-02 08:14:28 +0400
commitd4b515fa10dd52a2aef88df7299e9f3a8ab0957a (patch)
tree0110566b4e00aeb5215b1b967ff64695cd45eb10 /include/linux/ceph
parent60cf5992d96dd5b97baf74cd400d6e05f7f2c93e (diff)
downloadlinux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.tar.xz
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>
Diffstat (limited to 'include/linux/ceph')
-rw-r--r--include/linux/ceph/messenger.h3
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;