From 1807512bdab27363bf24bb56f043abd6f44eafb4 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Thu, 13 Mar 2014 14:48:48 +0000 Subject: [PATCH] isert: Remove unused code Signed-off-by: Yan Burman git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5328 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/iser.h | 1 - iscsi-scst/kernel/isert-scst/iser_datamover.c | 11 ----------- iscsi-scst/kernel/isert-scst/iser_datamover.h | 1 - iscsi-scst/kernel/isert-scst/iser_rdma.c | 14 -------------- 4 files changed, 27 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser.h b/iscsi-scst/kernel/isert-scst/iser.h index a2266a009..8141ebcfd 100644 --- a/iscsi-scst/kernel/isert-scst/iser.h +++ b/iscsi-scst/kernel/isert-scst/iser.h @@ -215,7 +215,6 @@ int isert_portal_listen(struct isert_portal *portal, 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); -struct isert_portal *isert_portal_add_addr_any(u16 port); /* iser connection */ int isert_post_recv(struct isert_connection *isert_conn, diff --git a/iscsi-scst/kernel/isert-scst/iser_datamover.c b/iscsi-scst/kernel/isert-scst/iser_datamover.c index 2dcbf9364..f46e7285e 100644 --- a/iscsi-scst/kernel/isert-scst/iser_datamover.c +++ b/iscsi-scst/kernel/isert-scst/iser_datamover.c @@ -90,17 +90,6 @@ out: return ret; } -void create_sockaddr_any(struct sockaddr *sa, u16 port, size_t *addr_len) -{ - struct sockaddr_in *sa_any = (struct sockaddr_in *)sa; - - memset(sa_any, 0, sizeof(*sa_any)); - sa_any->sin_family = AF_INET; - sa_any->sin_port = cpu_to_be16(port); - sa_any->sin_addr.s_addr = cpu_to_be32(INADDR_ANY); - *addr_len = sizeof(*sa_any); -} - void *isert_portal_add(struct sockaddr *saddr, size_t addr_len) { struct isert_portal *portal = isert_portal_start(saddr, addr_len); diff --git a/iscsi-scst/kernel/isert-scst/iser_datamover.h b/iscsi-scst/kernel/isert-scst/iser_datamover.h index 864b3d3ec..f403ce509 100644 --- a/iscsi-scst/kernel/isert-scst/iser_datamover.h +++ b/iscsi-scst/kernel/isert-scst/iser_datamover.h @@ -7,7 +7,6 @@ int isert_datamover_init(void); int isert_datamover_cleanup(void); -void create_sockaddr_any(struct sockaddr *sa, u16 port, size_t *addr_len); void *isert_portal_add(struct sockaddr *sa, size_t addr_len); int isert_portal_remove(void *portal_h); diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 030c923e9..f5cfeb19b 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -1531,17 +1531,3 @@ struct isert_portal *isert_portal_start(struct sockaddr *sa, size_t addr_len) return portal; } -struct isert_portal *isert_portal_add_addr_any(u16 port) -{ - struct sockaddr_storage sa_any; - size_t addr_len; - struct isert_portal *portal; - - create_sockaddr_any((struct sockaddr *)&sa_any, port, &addr_len); - - portal = isert_portal_start((struct sockaddr *)&sa_any, addr_len); - if (IS_ERR(portal)) - portal = NULL; - - return portal; -}