Commit e36b13cc authored by Alex Elder's avatar Alex Elder
Browse files

libceph: only call kernel_sendpage() via helper 



Make ceph_tcp_sendpage() be the only place kernel_sendpage() is
used, by using this helper in write_partial_msg_pages().

Signed-off-by: default avatarAlex Elder <elder@dreamhost.com>
Reviewed-by: default avatarSage Weil <sage@newdream.net>
parent 31739139

net/ceph/messenger.c

+2 −6
Original line number Diff line number Diff line
@@ -904,17 +904,13 @@ static int write_partial_msg_pages(struct ceph_connection *con) 
			con->out_msg->footer.data_crc = cpu_to_le32(crc);

			con->out_msg_pos.did_page_crc = true;

		}

		ret = kernel_sendpage(con->sock, page,

		ret = ceph_tcp_sendpage(con->sock, page,

				      con->out_msg_pos.page_pos + page_shift,

				      len,

				      MSG_DONTWAIT | MSG_NOSIGNAL |

				      MSG_MORE);

				      len, 1);



		if (do_datacrc && kaddr != zero_page_address)

			kunmap(page);



		if (ret == -EAGAIN)

			ret = 0;

		if (ret <= 0)

			goto out;