From 038e54cb3cb84469d9f7614b8d4cbf9fddb118da Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 17 Jan 2018 21:51:21 +0100 Subject: [PATCH] MINOR: epoll: get rid of the now useless fd_compute_new_polled_status() Do not call it anymore and avoid updating the fdstate. We're not very far from removing the fd lock it seems. --- src/ev_epoll.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ev_epoll.c b/src/ev_epoll.c index 924c083b2..3edaf288c 100644 --- a/src/ev_epoll.c +++ b/src/ev_epoll.c @@ -64,7 +64,7 @@ REGPRM1 static void __fd_clo(int fd) */ REGPRM2 static void _do_poll(struct poller *p, int exp) { - int status, eo, en; + int status, en; int fd, opcode; int count; int updt_idx; @@ -81,9 +81,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp) HA_SPIN_LOCK(FD_LOCK, &fdtab[fd].lock); fdtab[fd].update_mask &= ~tid_bit; - eo = fdtab[fd].state; - en = fd_compute_new_polled_status(eo); - fdtab[fd].state = en; + en = fdtab[fd].state; HA_SPIN_UNLOCK(FD_LOCK, &fdtab[fd].lock); if (fdtab[fd].polled_mask & tid_bit) {