From c67a1535dc9aec2333f1e248538d947d0ceebc00 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 12 Jul 2021 03:09:07 +0000 Subject: [PATCH] isert-scst: Remove isert_portal_listen() Remove this function since it is no longer used. Signed-off-by: Chesnokov Gleb [ bvanassche: edited patch description ] git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9482 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/iser.h | 3 -- iscsi-scst/kernel/isert-scst/iser_rdma.c | 58 ------------------------ 2 files changed, 61 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser.h b/iscsi-scst/kernel/isert-scst/iser.h index 0ccbfd787..b372324ed 100644 --- a/iscsi-scst/kernel/isert-scst/iser.h +++ b/iscsi-scst/kernel/isert-scst/iser.h @@ -290,9 +290,6 @@ extern struct kmem_cache *isert_conn_cache; /* iser portal */ struct isert_portal *isert_portal_create(struct sockaddr *sa, size_t addr_len); -int isert_portal_listen(struct isert_portal *portal, - struct sockaddr *sa, - size_t addr_len); void isert_portal_release(struct isert_portal *portal); void isert_portal_list_release_all(void); struct isert_portal *isert_portal_start(struct sockaddr *sa, size_t addr_len); diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 436d05df5..ba1d6cb4e 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -1890,64 +1890,6 @@ err_alloc: goto out; } -int isert_portal_listen(struct isert_portal *portal, - struct sockaddr *sa, - size_t addr_len) -{ - int err; - - TRACE_ENTRY(); - err = rdma_bind_addr(portal->cm_id, sa); - if (err) { - PRINT_WARNING("Failed to bind rdma addr, err:%d", err); - goto out; - } - err = rdma_listen(portal->cm_id, ISER_LISTEN_BACKLOG); - if (err) { - PRINT_ERROR("Failed rdma listen, err:%d", err); - goto out; - } - memcpy(&portal->addr, sa, addr_len); - - switch (sa->sa_family) { - case AF_INET: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - PRINT_INFO("iser portal cm_id:%p listens on: " - NIPQUAD_FMT ":%d", portal->cm_id, - NIPQUAD(((struct sockaddr_in *)sa)->sin_addr.s_addr), - (int)ntohs(((struct sockaddr_in *)sa)->sin_port)); -#else - PRINT_INFO("iser portal cm_id:%p listens on: %pI4:%d", - portal->cm_id, - &((struct sockaddr_in *)sa)->sin_addr.s_addr, - (int)ntohs(((struct sockaddr_in *)sa)->sin_port)); -#endif - break; - case AF_INET6: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - PRINT_INFO("iser portal cm_id:%p listens on: " - NIP6_FMT " %d", - portal->cm_id, - NIP6(((struct sockaddr_in6 *)sa)->sin6_addr), - (int)ntohs(((struct sockaddr_in6 *)sa)->sin6_port)); -#else - PRINT_INFO("iser portal cm_id:%p listens on: %pI6 %d", - portal->cm_id, - &((struct sockaddr_in6 *)sa)->sin6_addr, - (int)ntohs(((struct sockaddr_in6 *)sa)->sin6_port)); -#endif - break; - default: - PRINT_ERROR("Unknown address family"); - err = -EINVAL; - goto out; - } - -out: - TRACE_EXIT_RES(err); - return err; -} - static void isert_portal_free(struct isert_portal *portal) { lockdep_assert_held(&dev_list_mutex);