diff --git a/module/sock/uring/uring.c b/module/sock/uring/uring.c index ed2397678..32b5c1f38 100644 --- a/module/sock/uring/uring.c +++ b/module/sock/uring/uring.c @@ -740,7 +740,7 @@ uring_sock_writev(struct spdk_sock *_sock, struct iovec *iov, int iovcnt) } static int -sock_complete_reqs(struct spdk_sock *_sock, ssize_t rc, bool is_zcopy) +sock_complete_write_reqs(struct spdk_sock *_sock, ssize_t rc, bool is_zcopy) { struct spdk_uring_sock *sock = __uring_sock(_sock); struct spdk_sock_request *req; @@ -1046,7 +1046,7 @@ sock_uring_group_reap(struct spdk_uring_sock_group_impl *group, int max, int max sock->connection_status = status; spdk_sock_abort_requests(&sock->base); } else { - sock_complete_reqs(&sock->base, status, task->is_zcopy); + sock_complete_write_reqs(&sock->base, status, task->is_zcopy); } break; @@ -1177,7 +1177,7 @@ _sock_flush_client(struct spdk_sock *_sock) #ifdef SPDK_ZEROCOPY is_zcopy = flags & MSG_ZEROCOPY; #endif - retval = sock_complete_reqs(_sock, rc, is_zcopy); + retval = sock_complete_write_reqs(_sock, rc, is_zcopy); if (retval < 0) { /* if the socket is closed, return to avoid heap-use-after-free error */ return retval; diff --git a/test/unit/lib/sock/uring.c/uring_ut.c b/test/unit/lib/sock/uring.c/uring_ut.c index 88a03fd99..beeb0e9bd 100644 --- a/test/unit/lib/sock/uring.c/uring_ut.c +++ b/test/unit/lib/sock/uring.c/uring_ut.c @@ -186,7 +186,7 @@ flush_server(void) cb_arg1 = false; rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL); CU_ASSERT(rc == 2); - sock_complete_reqs(sock, 128, 0); + sock_complete_write_reqs(sock, 128, 0); CU_ASSERT(cb_arg1 == true); CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs)); @@ -197,7 +197,7 @@ flush_server(void) cb_arg2 = false; rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL); CU_ASSERT(rc == 4); - sock_complete_reqs(sock, 192, 0); + sock_complete_write_reqs(sock, 192, 0); CU_ASSERT(cb_arg1 == true); CU_ASSERT(cb_arg2 == true); CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs)); @@ -208,18 +208,18 @@ flush_server(void) cb_arg1 = false; rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL); CU_ASSERT(rc == 2); - sock_complete_reqs(sock, 92, 0); + sock_complete_write_reqs(sock, 92, 0); CU_ASSERT(rc == 2); CU_ASSERT(cb_arg1 == false); CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1); /* Get the second time partial sent result. */ - sock_complete_reqs(sock, 10, 0); + sock_complete_write_reqs(sock, 10, 0); CU_ASSERT(cb_arg1 == false); CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1); /* Data is finally sent. */ - sock_complete_reqs(sock, 26, 0); + sock_complete_write_reqs(sock, 26, 0); CU_ASSERT(cb_arg1 == true); CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));