From: Ilya Dryomov Date: Wed, 4 Nov 2020 09:26:39 +0000 (+0100) Subject: libceph: change ceph_msg_data_cursor_init() to take cursor X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ee8abf797bb3cb6007e30ac17a15f93277b0e91;p=linux.git libceph: change ceph_msg_data_cursor_init() to take cursor Make it possible to have local cursors and embed them outside struct ceph_msg. Signed-off-by: Ilya Dryomov --- diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 922fa158ffb25..ca3f39b4f6643 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1170,10 +1170,9 @@ static void __ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor) cursor->need_crc = true; } -static void ceph_msg_data_cursor_init(struct ceph_msg *msg, size_t length) +static void ceph_msg_data_cursor_init(struct ceph_msg_data_cursor *cursor, + struct ceph_msg *msg, size_t length) { - struct ceph_msg_data_cursor *cursor = &msg->cursor; - BUG_ON(!length); BUG_ON(length > msg->data_length); BUG_ON(!msg->num_data_items); @@ -1278,7 +1277,7 @@ static void prepare_message_data(struct ceph_msg *msg, u32 data_len) { /* Initialize data cursor */ - ceph_msg_data_cursor_init(msg, (size_t)data_len); + ceph_msg_data_cursor_init(&msg->cursor, msg, data_len); } /*