diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/messenger.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 589b7689d31b..9207a8c0b214 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -321,6 +321,19 @@ static int ceph_tcp_sendmsg(struct socket *sock, struct kvec *iov, | |||
321 | return r; | 321 | return r; |
322 | } | 322 | } |
323 | 323 | ||
324 | static int ceph_tcp_sendpage(struct socket *sock, struct page *page, | ||
325 | int offset, size_t size, int more) | ||
326 | { | ||
327 | int flags = MSG_DONTWAIT | MSG_NOSIGNAL | (more ? MSG_MORE : MSG_EOR); | ||
328 | int ret; | ||
329 | |||
330 | ret = kernel_sendpage(sock, page, offset, size, flags); | ||
331 | if (ret == -EAGAIN) | ||
332 | ret = 0; | ||
333 | |||
334 | return ret; | ||
335 | } | ||
336 | |||
324 | 337 | ||
325 | /* | 338 | /* |
326 | * Shutdown/close the socket for the given connection. | 339 | * Shutdown/close the socket for the given connection. |
@@ -944,12 +957,9 @@ static int write_partial_skip(struct ceph_connection *con) | |||
944 | int ret; | 957 | int ret; |
945 | 958 | ||
946 | while (con->out_skip > 0) { | 959 | while (con->out_skip > 0) { |
947 | struct kvec iov = { | 960 | size_t size = min(con->out_skip, (int) PAGE_CACHE_SIZE); |
948 | .iov_base = zero_page_address, | ||
949 | .iov_len = min(con->out_skip, (int)PAGE_CACHE_SIZE) | ||
950 | }; | ||
951 | 961 | ||
952 | ret = ceph_tcp_sendmsg(con->sock, &iov, 1, iov.iov_len, 1); | 962 | ret = ceph_tcp_sendpage(con->sock, zero_page, 0, size, 1); |
953 | if (ret <= 0) | 963 | if (ret <= 0) |
954 | goto out; | 964 | goto out; |
955 | con->out_skip -= ret; | 965 | con->out_skip -= ret; |