ceph: Remove CEPH_MSG_DATA_ITER, CEPH_OSD_DATA_TYPE_ITER and helpers Remove CEPH_MSG_DATA_ITER, CEPH_OSD_DATA_TYPE_ITER and their helpers as they're no longer used. Signed-off-by: David Howells <dhowells@redhat.com> cc: Viacheslav Dubeyko <slava@dubeyko.com> cc: Alex Markuze <amarkuze@redhat.com> cc: Ilya Dryomov <idryomov@gmail.com> cc: ceph-devel@vger.kernel.org
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 6be5c9a..8a7f723 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h
@@ -119,7 +119,6 @@ struct ceph_messenger { enum ceph_msg_data_type { CEPH_MSG_DATA_NONE, /* message contains no data payload */ CEPH_MSG_DATA_BVECQ, /* data source/destination is a bvecq */ - CEPH_MSG_DATA_ITER, /* data source/destination is an iov_iter */ }; struct ceph_msg_data { @@ -488,8 +487,6 @@ extern bool ceph_con_keepalive_expired(struct ceph_connection *con, unsigned long interval); void ceph_msg_data_add_bvecq(struct ceph_msg *msg, struct bvecq *bq, size_t len); -void ceph_msg_data_add_iter(struct ceph_msg *msg, - struct iov_iter *iter); struct ceph_msg *ceph_msg_new2(int type, int front_len, int max_data_items, gfp_t flags, bool can_fail);
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index cedb2e3..b7ab2d4 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h
@@ -104,7 +104,6 @@ struct ceph_osd { enum ceph_osd_data_type { CEPH_OSD_DATA_TYPE_NONE = 0, CEPH_OSD_DATA_TYPE_BVECQ, - CEPH_OSD_DATA_TYPE_ITER, }; struct ceph_osd_data { @@ -470,8 +469,6 @@ extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *, void osd_req_op_raw_data_in_bvecq(struct ceph_osd_request *osd_req, unsigned int which, struct bvecq *dbuf, size_t len); -void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req, - unsigned int which, struct iov_iter *iter); void osd_req_op_cls_request_bvecq(struct ceph_osd_request *req, unsigned int which,
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index fd606b3..cafa759 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c
@@ -782,7 +782,6 @@ static void __ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor) switch (cursor->data->type) { case CEPH_MSG_DATA_BVECQ: - case CEPH_MSG_DATA_ITER: ceph_msg_data_iter_cursor_init(cursor, length); break; case CEPH_MSG_DATA_NONE: @@ -819,7 +818,6 @@ struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor, switch (cursor->data->type) { case CEPH_MSG_DATA_BVECQ: - case CEPH_MSG_DATA_ITER: page = ceph_msg_data_iter_next(cursor, page_offset, length); break; case CEPH_MSG_DATA_NONE: @@ -847,7 +845,6 @@ void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, size_t bytes) BUG_ON(bytes > cursor->resid); switch (cursor->data->type) { case CEPH_MSG_DATA_BVECQ: - case CEPH_MSG_DATA_ITER: new_piece = ceph_msg_data_iter_advance(cursor, bytes); break; case CEPH_MSG_DATA_NONE: @@ -1597,18 +1594,6 @@ void ceph_msg_data_add_bvecq(struct ceph_msg *msg, struct bvecq *bvecq, size_t l } EXPORT_SYMBOL(ceph_msg_data_add_bvecq); -void ceph_msg_data_add_iter(struct ceph_msg *msg, - struct iov_iter *iter) -{ - struct ceph_msg_data *data; - - data = ceph_msg_data_add(msg); - data->type = CEPH_MSG_DATA_ITER; - data->iter = *iter; - - msg->data_length += iov_iter_count(&data->iter); -} - /* * construct a new message with given type, size * the new msg has a ref count of 1.
diff --git a/net/ceph/messenger_v1.c b/net/ceph/messenger_v1.c index 84c0b74..8257d0b 100644 --- a/net/ceph/messenger_v1.c +++ b/net/ceph/messenger_v1.c
@@ -521,8 +521,7 @@ static int write_partial_message_data(struct ceph_connection *con, continue; } - if (cursor->data->type == CEPH_MSG_DATA_BVECQ || - cursor->data->type == CEPH_MSG_DATA_ITER) { + if (cursor->data->type == CEPH_MSG_DATA_BVECQ) { ret = ceph_tcp_sock_sendmsg(con->sock, &cursor->iov_iter, MSG_MORE); if (ret <= 0) {
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index de8f968..7bf582e 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c
@@ -122,13 +122,6 @@ static void ceph_osd_data_init(struct ceph_osd_data *osd_data) osd_data->type = CEPH_OSD_DATA_TYPE_NONE; } -static void ceph_osd_iter_init(struct ceph_osd_data *osd_data, - struct iov_iter *iter) -{ - osd_data->type = CEPH_OSD_DATA_TYPE_ITER; - osd_data->iter = *iter; -} - /* * Consumes a ref on @dbuf. */ @@ -179,22 +172,6 @@ void osd_req_op_extent_osd_bvecq(struct ceph_osd_request *osd_req, } EXPORT_SYMBOL(osd_req_op_extent_osd_bvecq); -/** - * osd_req_op_extent_osd_iter - Set up an operation with an iterator buffer - * @osd_req: The request to set up - * @which: Index of the operation in which to set the iter - * @iter: The buffer iterator - */ -void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req, - unsigned int which, struct iov_iter *iter) -{ - struct ceph_osd_data *osd_data; - - osd_data = osd_req_op_data(osd_req, which, extent, osd_data); - ceph_osd_iter_init(osd_data, iter); -} -EXPORT_SYMBOL(osd_req_op_extent_osd_iter); - static void osd_req_op_cls_request_info_bvecq(struct ceph_osd_request *osd_req, unsigned int which, struct bvecq *bvecq, @@ -241,8 +218,6 @@ static u64 ceph_osd_data_length(struct ceph_osd_data *osd_data) return 0; case CEPH_OSD_DATA_TYPE_BVECQ: return osd_data->bvecq_len; - case CEPH_OSD_DATA_TYPE_ITER: - return iov_iter_count(&osd_data->iter); default: WARN(true, "unrecognized data type %d\n", (int)osd_data->type); return 0; @@ -817,8 +792,6 @@ static void ceph_osdc_msg_data_add(struct ceph_msg *msg, if (osd_data->type == CEPH_OSD_DATA_TYPE_BVECQ) { BUG_ON(!length); ceph_msg_data_add_bvecq(msg, osd_data->bvecq, length); - } else if (osd_data->type == CEPH_OSD_DATA_TYPE_ITER) { - ceph_msg_data_add_iter(msg, &osd_data->iter); } else { BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_NONE); }