From b18fdef111a582c861fd9e2e5851a079fbf6fa7e Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 30 Mar 2021 13:30:34 -0700 Subject: [PATCH] sock: sock_map_lookup now takes map as first parameter Signed-off-by: Ben Walker Change-Id: Id294ed4b25352735309bf04e83d09eb455c1b8cb Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7216 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk --- lib/sock/sock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sock/sock.c b/lib/sock/sock.c index 25532920d..2e9c0b3ae 100644 --- a/lib/sock/sock.c +++ b/lib/sock/sock.c @@ -135,14 +135,14 @@ sock_map_release(struct spdk_sock_map *map, int placement_id) /* Look up the group for a placement_id. */ static int -sock_map_lookup(int placement_id, struct spdk_sock_group **group) +sock_map_lookup(struct spdk_sock_map *map, int placement_id, struct spdk_sock_group **group) { struct spdk_sock_placement_id_entry *entry; int rc = -EINVAL; *group = NULL; - pthread_mutex_lock(&g_map.mtx); - STAILQ_FOREACH(entry, &g_map.entries, link) { + pthread_mutex_lock(&map->mtx); + STAILQ_FOREACH(entry, &map->entries, link) { if (placement_id == entry->placement_id) { assert(entry->group != NULL); *group = entry->group; @@ -150,7 +150,7 @@ sock_map_lookup(int placement_id, struct spdk_sock_group **group) break; } } - pthread_mutex_unlock(&g_map.mtx); + pthread_mutex_unlock(&map->mtx); return rc; } @@ -189,7 +189,7 @@ spdk_sock_get_optimal_sock_group(struct spdk_sock *sock, struct spdk_sock_group placement_id = sock_get_placement_id(sock); if (placement_id != -1) { - sock_map_lookup(placement_id, group); + sock_map_lookup(&g_map, placement_id, group); return 0; } else { return -1;