[PATCH] fork: fix pidfd_poll()'s return type

* [PATCH] fork: fix pidfd_poll()'s return type
@ 2019-11-20  0:07 Luc Van Oostenryck
  2019-11-20  0:21 ` Christian Brauner
  0 siblings, 1 reply; 4+ messages in thread
From: Luc Van Oostenryck @ 2019-11-20  0:07 UTC (permalink / raw)
  To: linux-kernel; +Cc: Luc Van Oostenryck, Joel Fernandes, Christian Brauner

pidfd_poll() is defined as returning 'unsigned int' but the
.poll method is declared as returning '__poll_t', a bitwise type.

Fix this by using the proper return type and using the EPOLL
constants instead of the POLL ones, as required for __poll_t.

CC: Joel Fernandes (Google) <joel@joelfernandes.org>
CC: Christian Brauner <christian@brauner.io>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 kernel/fork.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/fork.c b/kernel/fork.c
index 55af6931c6ec..13b38794efb5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1708,11 +1708,11 @@ static void pidfd_show_fdinfo(struct seq_file *m, struct file *f)
 /*
  * Poll support for process exit notification.
  */
-static unsigned int pidfd_poll(struct file *file, struct poll_table_struct *pts)
+static __poll_t pidfd_poll(struct file *file, struct poll_table_struct *pts)
 {
 	struct task_struct *task;
 	struct pid *pid = file->private_data;
-	int poll_flags = 0;
+	__poll_t poll_flags = 0;
 
 	poll_wait(file, &pid->wait_pidfd, pts);
 
@@ -1724,7 +1724,7 @@ static unsigned int pidfd_poll(struct file *file, struct poll_table_struct *pts)
 	 * group, then poll(2) should block, similar to the wait(2) family.
 	 */
 	if (!task || (task->exit_state && thread_group_empty(task)))
-		poll_flags = POLLIN | POLLRDNORM;
+		poll_flags = EPOLLIN | EPOLLRDNORM;
 	rcu_read_unlock();
 
 	return poll_flags;
-- 
2.24.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread