summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-05 14:46:01 -0500
committerSage Weil <sage@inktank.com>2013-05-01 21:18:34 -0700
commit90af36022aecdeeb1b9c0755461187de717c86dd (patch)
tree275c653789249a7499165cb36ddb608b5b4bc6df /fs
parentca8b3a69174b04376722672d7dd6b666a7f17c50 (diff)
downloadop-kernel-dev-90af36022aecdeeb1b9c0755461187de717c86dd.zip
op-kernel-dev-90af36022aecdeeb1b9c0755461187de717c86dd.tar.gz
libceph: add, don't set data for a message
Change the names of the functions that put data on a pagelist to reflect that we're adding to whatever's already there rather than just setting it to the one thing. Currently only one data item is ever added to a message, but that's about to change. This resolves: http://tracker.ceph.com/issues/2770 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 13ae44e..4f22671 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1724,7 +1724,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
if (req->r_data_len) {
/* outbound data set only by ceph_sync_setxattr() */
BUG_ON(!req->r_pages);
- ceph_msg_data_set_pages(msg, req->r_pages, req->r_data_len, 0);
+ ceph_msg_data_add_pages(msg, req->r_pages, req->r_data_len, 0);
}
msg->hdr.data_len = cpu_to_le32(req->r_data_len);
@@ -2608,7 +2608,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
if (pagelist->length) {
/* set up outbound data if we have any */
reply->hdr.data_len = cpu_to_le32(pagelist->length);
- ceph_msg_data_set_pagelist(reply, pagelist);
+ ceph_msg_data_add_pagelist(reply, pagelist);
}
ceph_con_send(&session->s_con, reply);
OpenPOWER on IntegriCloud