aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-08 14:35:36 -0500
committerSage Weil <sage@inktank.com>2013-05-02 00:17:05 -0400
commit9d2a06c2750177dca5f8d0e89884c1d409d64bbc (patch)
tree0423695d2b76161c2c537b331464a207ea25d832 /include
parent95e072eb38f99c724739d91a1f12bb8bfe1619b5 (diff)
libceph: kill message trail
The wart that is the ceph message trail can now be removed, because its only user was the osd client, and the previous patch made that no longer the case. The result allows write_partial_msg_pages() to be simplified considerably. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ceph/messenger.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index b53b9ef65009..0e4536cc46f0 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -69,7 +69,6 @@ struct ceph_messenger {
69#ifdef CONFIG_BLOCK 69#ifdef CONFIG_BLOCK
70#define ceph_msg_has_bio(m) ((m)->b.type == CEPH_MSG_DATA_BIO) 70#define ceph_msg_has_bio(m) ((m)->b.type == CEPH_MSG_DATA_BIO)
71#endif /* CONFIG_BLOCK */ 71#endif /* CONFIG_BLOCK */
72#define ceph_msg_has_trail(m) ((m)->t.type == CEPH_MSG_DATA_PAGELIST)
73 72
74enum ceph_msg_data_type { 73enum ceph_msg_data_type {
75 CEPH_MSG_DATA_NONE, /* message contains no data payload */ 74 CEPH_MSG_DATA_NONE, /* message contains no data payload */
@@ -155,7 +154,6 @@ struct ceph_msg {
155#ifdef CONFIG_BLOCK 154#ifdef CONFIG_BLOCK
156 struct ceph_msg_data b; /* bio */ 155 struct ceph_msg_data b; /* bio */
157#endif /* CONFIG_BLOCK */ 156#endif /* CONFIG_BLOCK */
158 struct ceph_msg_data t; /* trail */
159 157
160 struct ceph_connection *con; 158 struct ceph_connection *con;
161 struct list_head list_head; /* links for connection lists */ 159 struct list_head list_head; /* links for connection lists */
@@ -295,8 +293,6 @@ extern void ceph_msg_data_set_pages(struct ceph_msg *msg, struct page **pages,
295extern void ceph_msg_data_set_pagelist(struct ceph_msg *msg, 293extern void ceph_msg_data_set_pagelist(struct ceph_msg *msg,
296 struct ceph_pagelist *pagelist); 294 struct ceph_pagelist *pagelist);
297extern void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio); 295extern void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio);
298extern void ceph_msg_data_set_trail(struct ceph_msg *msg,
299 struct ceph_pagelist *trail);
300 296
301extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags, 297extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
302 bool can_fail); 298 bool can_fail);