From 15a415461cc65b62d5e59b60fd60ddff90f56e5e Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Tue, 28 Apr 2020 05:27:29 +0800 Subject: [PATCH] uring: Change the location of spdk_uring_sock_group_impl_remove_sock Purpose: prepare for the next patch Change-Id: Iae6a3d7a2c90a78c7dd1e510e718e4e1c07b3f32 Signed-off-by: Ziye Yang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2048 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- module/sock/uring/uring.c | 62 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/module/sock/uring/uring.c b/module/sock/uring/uring.c index d62e9f24c..cae258d03 100644 --- a/module/sock/uring/uring.c +++ b/module/sock/uring/uring.c @@ -1162,37 +1162,6 @@ spdk_uring_sock_group_impl_add_sock(struct spdk_sock_group_impl *_group, return 0; } -static int -spdk_uring_sock_group_impl_remove_sock(struct spdk_sock_group_impl *_group, - struct spdk_sock *_sock) -{ - struct spdk_uring_sock *sock = __uring_sock(_sock); - struct spdk_uring_sock_group_impl *group = __uring_group_impl(_group); - - - if (sock->write_task.status != SPDK_URING_SOCK_TASK_NOT_IN_USE) { - sock->outstanding_io++; - } - - if (sock->pollin_task.status != SPDK_URING_SOCK_TASK_NOT_IN_USE) { - sock->outstanding_io++; - } - - if (sock->recv_pipe != NULL) { - if (spdk_pipe_reader_bytes_available(sock->recv_pipe) > 0) { - TAILQ_REMOVE(&group->pending_recv, sock, link); - sock->pending_recv = false; - } - assert(sock->pending_recv == false); - } - - if (!sock->outstanding_io) { - sock->group = NULL; - } - - return 0; -} - static int spdk_uring_sock_group_impl_poll(struct spdk_sock_group_impl *_group, int max_events, struct spdk_sock **socks) @@ -1231,6 +1200,37 @@ spdk_uring_sock_group_impl_poll(struct spdk_sock_group_impl *_group, int max_eve return count; } +static int +spdk_uring_sock_group_impl_remove_sock(struct spdk_sock_group_impl *_group, + struct spdk_sock *_sock) +{ + struct spdk_uring_sock *sock = __uring_sock(_sock); + struct spdk_uring_sock_group_impl *group = __uring_group_impl(_group); + + + if (sock->write_task.status != SPDK_URING_SOCK_TASK_NOT_IN_USE) { + sock->outstanding_io++; + } + + if (sock->pollin_task.status != SPDK_URING_SOCK_TASK_NOT_IN_USE) { + sock->outstanding_io++; + } + + if (sock->recv_pipe != NULL) { + if (spdk_pipe_reader_bytes_available(sock->recv_pipe) > 0) { + TAILQ_REMOVE(&group->pending_recv, sock, link); + sock->pending_recv = false; + } + assert(sock->pending_recv == false); + } + + if (!sock->outstanding_io) { + sock->group = NULL; + } + + return 0; +} + static int spdk_uring_sock_group_impl_close(struct spdk_sock_group_impl *_group) {