Re: [PATCH 06/14] Move ep_take_care_of_epollwakeup() to fs/eventpoll.c

From
Thomas Huth <hidden>
Date
2023-02-10 14:46:52
Also in
linux-arch, linux-fsdevel, lkml
Reply to
Palmer Dabbelt, 2015-11-10
On 10/11/2015 02.31, Palmer Dabbelt wrote:
quoted hunk ↗ jump to hunk
This doesn't make any sense to expose to userspace, so it's been moved
to the one user.  This was introduced by commit 95f19f658ce1 ("epoll:
drop EPOLLWAKEUP if PM_SLEEP is disabled").

Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
Reviewed-by: Andrew Waterman <redacted>
Reviewed-by: Albert Ou <aou@eecs.berkeley.edu>
---
  fs/eventpoll.c                 | 13 +++++++++++++
  include/uapi/linux/eventpoll.h | 12 ------------
  2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 1e009ca..aadee3d 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1812,6 +1812,19 @@ SYSCALL_DEFINE1(epoll_create, int, size)
  	return sys_epoll_create1(0);
  }
  
+#ifdef CONFIG_PM_SLEEP
+static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
+{
+	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
+		epev->events &= ~EPOLLWAKEUP;
+}
+#else
+static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
+{
+	epev->events &= ~EPOLLWAKEUP;
+}
+#endif
+
  /*
   * The following function implements the controller interface for
   * the eventpoll file that enables the insertion/removal/change of
diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
index bc81fb2..7850373 100644
--- a/include/uapi/linux/eventpoll.h
+++ b/include/uapi/linux/eventpoll.h
@@ -61,16 +61,4 @@ struct epoll_event {
  	__u64 data;
  } EPOLL_PACKED;
  
-#ifdef CONFIG_PM_SLEEP
-static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
-{
-	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
-		epev->events &= ~EPOLLWAKEUP;
-}
-#else
-static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
-{
-	epev->events &= ~EPOLLWAKEUP;
-}
-#endif
  #endif /* _UAPI_LINUX_EVENTPOLL_H */
 Hi!

Looks like this patch has never been merged? ... I just came across this "#ifdef CONFIG_..." in the uapi directory, and it also seems wrong to me to check CONFIG_* switches here, so could somebody maybe pick this patch up now and merge it?

 Thanks,
  Thomas
Thread (169 messages) 169 messages, 8 authors, last reply 2023-02-10
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help