From 04692154be838c460d752f3b8e3987b4055938a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Va=C5=A1ek?= <david.vasek@nic.cz>
Date: Tue, 10 Sep 2019 21:26:56 +0200
Subject: [PATCH] tcp-handler, udp-handler: remove rcu_read_lock()'s from the
UDP and TCP ifaces inits
---
src/knot/server/tcp-handler.c | 2 --
src/knot/server/udp-handler.c | 5 +----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c
index e0d03e790a..ec4c2a45e6 100644
--- a/src/knot/server/tcp-handler.c
+++ b/src/knot/server/tcp-handler.c
@@ -128,13 +128,11 @@ static unsigned tcp_set_ifaces(const list_t *ifaces, fdset_t *fds, int thread_id
{
assert(ifaces != NULL && fds != NULL);
- rcu_read_lock();
fdset_clear(fds);
iface_t *i = NULL;
WALK_LIST(i, *ifaces) {
fdset_add(fds, i->fd_tcp, POLLIN, NULL);
}
- rcu_read_unlock();
return fds->n;
}
diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c
index ad6555112d..a36bf02ccb 100644
--- a/src/knot/server/udp-handler.c
+++ b/src/knot/server/udp-handler.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/* Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
#include <string.h>
#include <assert.h>
#include <sys/param.h>
-#include <urcu.h>
#ifdef HAVE_SYS_UIO_H // struct iovec (OpenBSD)
#include <sys/uio.h>
#endif /* HAVE_SYS_UIO_H */
@@ -383,7 +382,6 @@ static nfds_t track_ifaces(const list_t *ifaces, struct pollfd **fds_ptr,
assert(ifaces && fds_ptr);
nfds_t nfds = list_size(ifaces);
- rcu_read_lock();
struct pollfd *fds = malloc(nfds * sizeof(*fds));
if (!fds) {
*fds_ptr = NULL;
@@ -401,7 +399,6 @@ static nfds_t track_ifaces(const list_t *ifaces, struct pollfd **fds_ptr,
assert(i == nfds);
*fds_ptr = fds;
- rcu_read_unlock();
return nfds;
}
--
GitLab