summaryrefslogtreecommitdiff
path: root/include/linux/ceph
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-08 13:35:36 -0600
committerSage Weil <sage@inktank.com>2013-05-01 21:17:05 -0700
commit9d2a06c2750177dca5f8d0e89884c1d409d64bbc (patch)
tree0423695d2b76161c2c537b331464a207ea25d832 /include/linux/ceph
parent95e072eb38f99c724739d91a1f12bb8bfe1619b5 (diff)
downloadlinux-stable-9d2a06c2750177dca5f8d0e89884c1d409d64bbc.tar.gz
linux-stable-9d2a06c2750177dca5f8d0e89884c1d409d64bbc.tar.bz2
linux-stable-9d2a06c2750177dca5f8d0e89884c1d409d64bbc.zip
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/linux/ceph')
-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 {
#ifdef CONFIG_BLOCK
#define ceph_msg_has_bio(m) ((m)->b.type == CEPH_MSG_DATA_BIO)
#endif /* CONFIG_BLOCK */
-#define ceph_msg_has_trail(m) ((m)->t.type == CEPH_MSG_DATA_PAGELIST)
enum ceph_msg_data_type {
CEPH_MSG_DATA_NONE, /* message contains no data payload */
@@ -155,7 +154,6 @@ struct ceph_msg {
#ifdef CONFIG_BLOCK
struct ceph_msg_data b; /* bio */
#endif /* CONFIG_BLOCK */
- struct ceph_msg_data t; /* trail */
struct ceph_connection *con;
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,
extern void ceph_msg_data_set_pagelist(struct ceph_msg *msg,
struct ceph_pagelist *pagelist);
extern void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio);
-extern void ceph_msg_data_set_trail(struct ceph_msg *msg,
- struct ceph_pagelist *trail);
extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
bool can_fail);