From: Willy Tarreau <w@1wt.eu>
Date: Wed, 17 Jan 2018 20:51:21 +0000 (+0100)
Subject: MINOR: epoll: get rid of the now useless fd_compute_new_polled_status()
X-Git-Tag: v1.9-dev1~445
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=038e54cb3cb84469d9f7614b8d4cbf9fddb118da;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 924c083b25..3edaf288cb 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) {