Commit ee97302f authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov

libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()

These functions are supposed to behave like other read_partial_*()
handlers: the contract with messenger v1 is that the handler bails if
the area of the message it's responsible for is already processed.
This comes up when handling short reads from the socket.

[ idryomov: changelog ]
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Acked-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent cd7d469c
......@@ -991,7 +991,7 @@ static inline int read_partial_message_section(struct ceph_connection *con,
return read_partial_message_chunk(con, section, sec_len, crc);
}
static int read_sparse_msg_extent(struct ceph_connection *con, u32 *crc)
static int read_partial_sparse_msg_extent(struct ceph_connection *con, u32 *crc)
{
struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;
bool do_bounce = ceph_test_opt(from_msgr(con->msgr), RXBOUNCE);
......@@ -1026,7 +1026,7 @@ static int read_sparse_msg_extent(struct ceph_connection *con, u32 *crc)
return 1;
}
static int read_sparse_msg_data(struct ceph_connection *con)
static int read_partial_sparse_msg_data(struct ceph_connection *con)
{
struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;
bool do_datacrc = !ceph_test_opt(from_msgr(con->msgr), NOCRC);
......@@ -1043,7 +1043,7 @@ static int read_sparse_msg_data(struct ceph_connection *con)
con->v1.in_sr_len,
&crc);
else if (cursor->sr_resid > 0)
ret = read_sparse_msg_extent(con, &crc);
ret = read_partial_sparse_msg_extent(con, &crc);
if (ret <= 0) {
if (do_datacrc)
......@@ -1254,7 +1254,7 @@ static int read_partial_message(struct ceph_connection *con)
return -EIO;
if (m->sparse_read)
ret = read_sparse_msg_data(con);
ret = read_partial_sparse_msg_data(con);
else if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE))
ret = read_partial_msg_data_bounce(con);
else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment