Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 343128ce authored by Shraddha Barke's avatar Shraddha Barke Committed by Ilya Dryomov
Browse files

libceph: use local variable cursor instead of &msg->cursor 



Use local variable cursor in place of &msg->cursor in
read_partial_msg_data() and write_partial_msg_data().

Signed-off-by: default avatarShraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 70cf052d

net/ceph/messenger.c

+5 −6
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ static int write_partial_message_data(struct ceph_connection *con) 
		bool need_crc;

		int ret;



		page = ceph_msg_data_next(&msg->cursor, &page_offset, &length,

		page = ceph_msg_data_next(cursor, &page_offset, &length,

					  &last_piece);

		ret = ceph_tcp_sendpage(con->sock, page, page_offset,

					length, !last_piece);
@@ -1564,7 +1564,7 @@ static int write_partial_message_data(struct ceph_connection *con) 
		}

		if (do_datacrc && cursor->need_crc)

			crc = ceph_crc32c_page(crc, page, page_offset, length);

		need_crc = ceph_msg_data_advance(&msg->cursor, (size_t)ret);

		need_crc = ceph_msg_data_advance(cursor, (size_t)ret);

	}



	dout("%s %p msg %p done\n", __func__, con, msg);
@@ -2246,8 +2246,7 @@ static int read_partial_msg_data(struct ceph_connection *con) 
	if (do_datacrc)

		crc = con->in_data_crc;

	while (cursor->resid) {

		page = ceph_msg_data_next(&msg->cursor, &page_offset, &length,

							NULL);

		page = ceph_msg_data_next(cursor, &page_offset, &length, NULL);

		ret = ceph_tcp_recvpage(con->sock, page, page_offset, length);

		if (ret <= 0) {

			if (do_datacrc)
@@ -2258,7 +2257,7 @@ static int read_partial_msg_data(struct ceph_connection *con) 


		if (do_datacrc)

			crc = ceph_crc32c_page(crc, page, page_offset, ret);

		(void) ceph_msg_data_advance(&msg->cursor, (size_t)ret);

		(void) ceph_msg_data_advance(cursor, (size_t)ret);

	}

	if (do_datacrc)

		con->in_data_crc = crc;