summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-25 17:35:46 -0600
committerSage Weil <sage@inktank.com>2013-05-01 21:14:28 -0700
commitd4b515fa10dd52a2aef88df7299e9f3a8ab0957a (patch)
tree0110566b4e00aeb5215b1b967ff64695cd45eb10 /fs
parent60cf5992d96dd5b97baf74cd400d6e05f7f2c93e (diff)
downloadlinux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.tar.gz
linux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.tar.bz2
linux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.zip
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 'fs')
-rw-r--r--fs/ceph/mds_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 442880d099c9..5c17705f88b1 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1719,7 +1719,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
msg->hdr.front_len = cpu_to_le32(msg->front.iov_len);
msg->pages = req->r_pages;
- msg->nr_pages = req->r_num_pages;
+ msg->page_count = req->r_num_pages;
msg->hdr.data_len = cpu_to_le32(req->r_data_len);
msg->hdr.data_off = cpu_to_le16(0);
@@ -2600,10 +2600,10 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
}
reply->pagelist = pagelist;
+ reply->pagelist_count = calc_pages_for(0, pagelist->length);
if (recon_state.flock)
reply->hdr.version = cpu_to_le16(2);
reply->hdr.data_len = cpu_to_le32(pagelist->length);
- reply->nr_pages = calc_pages_for(0, pagelist->length);
ceph_con_send(&session->s_con, reply);
mutex_unlock(&session->s_mutex);