[sr-dev] git:master:cb58e78e: Revert "core: io wait - unhash in case delete operation fails because of EBADF"

Daniel-Constantin Mierla miconda at gmail.com
Tue Jul 7 17:37:28 CEST 2020


Module: kamailio
Branch: master
Commit: cb58e78eaac941cc042a71e049568b2dae611e4b
URL: https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2dae611e4b

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-07-07T17:36:22+02:00

Revert "core: io wait - unhash in case delete operation fails because of EBADF"

This reverts commit 60119faef5282b135ef7c972d15e1017ca26815a.

---

Modified: src/core/io_wait.h

---

Diff:  https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2dae611e4b.diff
Patch: https://github.com/kamailio/kamailio/commit/cb58e78eaac941cc042a71e049568b2dae611e4b.patch

---

diff --git a/src/core/io_wait.h b/src/core/io_wait.h
index ddc7e80324..251c65fdff 100644
--- a/src/core/io_wait.h
+++ b/src/core/io_wait.h
@@ -669,12 +669,6 @@ inline static int io_watch_del(io_wait_h* h, int fd, int idx, int flags)
 					if (errno==EAGAIN) goto again_epoll;
 					LM_ERR("removing fd %d from epoll list failed: %s [%d]\n",
 						fd, strerror(errno), errno);
-					if (unlikely(errno==EBADF)) {
-						LM_ERR("unhashing of invalid fd - %d (epfd %d)\n", fd,
-								h->h->epfd);
-						unhash_fd_map(e);
-						h->fd_no--;
-					}
 					goto error;
 				}
 #ifdef EPOLL_NO_CLOSE_BUG




More information about the sr-dev mailing list