diff options
author | Alex Elder <elder@inktank.com> | 2013-04-05 15:46:01 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-05-02 00:18:34 -0400 |
commit | 90af36022aecdeeb1b9c0755461187de717c86dd (patch) | |
tree | 275c653789249a7499165cb36ddb608b5b4bc6df /fs | |
parent | ca8b3a69174b04376722672d7dd6b666a7f17c50 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 13ae44eaa980..4f22671a5bd4 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, | |||
1724 | if (req->r_data_len) { | 1724 | if (req->r_data_len) { |
1725 | /* outbound data set only by ceph_sync_setxattr() */ | 1725 | /* outbound data set only by ceph_sync_setxattr() */ |
1726 | BUG_ON(!req->r_pages); | 1726 | BUG_ON(!req->r_pages); |
1727 | ceph_msg_data_set_pages(msg, req->r_pages, req->r_data_len, 0); | 1727 | ceph_msg_data_add_pages(msg, req->r_pages, req->r_data_len, 0); |
1728 | } | 1728 | } |
1729 | 1729 | ||
1730 | msg->hdr.data_len = cpu_to_le32(req->r_data_len); | 1730 | 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, | |||
2608 | if (pagelist->length) { | 2608 | if (pagelist->length) { |
2609 | /* set up outbound data if we have any */ | 2609 | /* set up outbound data if we have any */ |
2610 | reply->hdr.data_len = cpu_to_le32(pagelist->length); | 2610 | reply->hdr.data_len = cpu_to_le32(pagelist->length); |
2611 | ceph_msg_data_set_pagelist(reply, pagelist); | 2611 | ceph_msg_data_add_pagelist(reply, pagelist); |
2612 | } | 2612 | } |
2613 | ceph_con_send(&session->s_con, reply); | 2613 | ceph_con_send(&session->s_con, reply); |
2614 | 2614 | ||