From 811b2f150aae06ae0d211dc97416b847986798a3 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 9 May 2017 15:46:35 -0400 Subject: [PATCH] Fix: COMPAT_EPOLL_PROC_PATH is available from Linux 2.6.28 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: Typo in commit message "per see" -> "per se" Failing on opening [1] is not an error per se. [1] was introduced in Linux 2.6.28 but epoll is available since 2.5.44. Hence, goto end and set a default value without setting error return value. [1] /proc/sys/fs/epoll/max_user_watches Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/common/compat/compat-epoll.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common/compat/compat-epoll.c b/src/common/compat/compat-epoll.c index 6259fd389..f4befa1a2 100644 --- a/src/common/compat/compat-epoll.c +++ b/src/common/compat/compat-epoll.c @@ -259,7 +259,15 @@ int compat_epoll_set_max_size(void) fd = open(COMPAT_EPOLL_PROC_PATH, O_RDONLY); if (fd < 0) { - retval = -1; + /* + * Failing on opening [1] is not an error per see. [1] was + * introduced in Linux 2.6.28 but epoll is available since + * 2.5.44. Hence, goto end and set a default value without + * setting an error return value. + * + * [1] /proc/sys/fs/epoll/max_user_watches + */ + retval = 0; goto end; } -- 2.34.1