4 files changed, 26 insertions, 21 deletions

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 49d3c6fda89a..80b9b84391a9 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -39,7 +39,7 @@
 #include <linux/device.h>
 #include <linux/pid_namespace.h>
 #include <asm/io.h>
-#include <asm/poll.h>
+#include <linux/poll.h>
 #include <linux/uaccess.h>
 
 #include <linux/coda.h>
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 6fdbf21be318..20bb73a931dd 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/atomic.h>
 #include <linux/device.h>
-#include <asm/poll.h>
+#include <linux/poll.h>
 
 #include "internal.h"
 
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 42e35a6977c9..d1a490c7e6c3 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -260,6 +260,7 @@ struct ep_pqueue {
 struct ep_send_events_data {
         int maxevents;
         struct epoll_event __user *events;
+        int res;
 };
 
 /*
@@ -660,12 +661,13 @@ static inline void ep_pm_stay_awake_rcu(struct epitem *epi)
  *
  * Returns: The same integer error code returned by the @sproc callback.
  */
-static int ep_scan_ready_list(struct eventpoll *ep,
-                              int (*sproc)(struct eventpoll *,
+static __poll_t ep_scan_ready_list(struct eventpoll *ep,
+                              __poll_t (*sproc)(struct eventpoll *,
                                            struct list_head *, void *),
                               void *priv, int depth, bool ep_locked)
 {
-        int error, pwake = 0;
+        __poll_t res;
+        int pwake = 0;
         unsigned long flags;
         struct epitem *epi, *nepi;
         LIST_HEAD(txlist);
@@ -694,7 +696,7 @@ static int ep_scan_ready_list(struct eventpoll *ep,
         /*
          * Now call the callback function.
          */
-        error = (*sproc)(ep, &txlist, priv);
+        res = (*sproc)(ep, &txlist, priv);
 
         spin_lock_irqsave(&ep->lock, flags);
         /*
@@ -747,7 +749,7 @@ static int ep_scan_ready_list(struct eventpoll *ep,
         if (pwake)
                 ep_poll_safewake(&ep->poll_wait);
 
-        return error;
+        return res;
 }
 
 static void epi_rcu_free(struct rcu_head *head)
@@ -864,7 +866,7 @@ static int ep_eventpoll_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
+static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
                                void *priv);
 static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead,
                                  poll_table *pt);
@@ -874,7 +876,7 @@ static void ep_ptable_queue_proc(struct file *file, wait_queue_head_t *whead,
  * the ep->mtx so we need to start from depth=1, such that mutex_lock_nested()
  * is correctly annotated.
  */
-static unsigned int ep_item_poll(const struct epitem *epi, poll_table *pt,
+static __poll_t ep_item_poll(const struct epitem *epi, poll_table *pt,
                                  int depth)
 {
         struct eventpoll *ep;
@@ -894,7 +896,7 @@ static unsigned int ep_item_poll(const struct epitem *epi, poll_table *pt,
                                   locked) & epi->event.events;
 }
 
-static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
+static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
                                void *priv)
 {
         struct epitem *epi, *tmp;
@@ -1414,7 +1416,8 @@ static noinline void ep_destroy_wakeup_source(struct epitem *epi)
 static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
                      struct file *tfile, int fd, int full_check)
 {
-        int error, revents, pwake = 0;
+        int error, pwake = 0;
+        __poll_t revents;
         unsigned long flags;
         long user_watches;
         struct epitem *epi;
@@ -1612,12 +1615,11 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,
         return 0;
 }
 
-static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
+static __poll_t ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
                                void *priv)
 {
         struct ep_send_events_data *esed = priv;
-        int eventcnt;
-        unsigned int revents;
+        __poll_t revents;
         struct epitem *epi;
         struct epoll_event __user *uevent;
         struct wakeup_source *ws;
@@ -1630,8 +1632,8 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
          * Items cannot vanish during the loop because ep_scan_ready_list() is
          * holding "mtx" during this call.
          */
-        for (eventcnt = 0, uevent = esed->events;
-             !list_empty(head) && eventcnt < esed->maxevents;) {
+        for (esed->res = 0, uevent = esed->events;
+             !list_empty(head) && esed->res < esed->maxevents;) {
                 epi = list_first_entry(head, struct epitem, rdllink);
 
                 /*
@@ -1665,9 +1667,11 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
                             __put_user(epi->event.data, &uevent->data)) {
                                 list_add(&epi->rdllink, head);
                                 ep_pm_stay_awake(epi);
-                                return eventcnt ? eventcnt : -EFAULT;
+                                if (!esed->res)
+                                        esed->res = -EFAULT;
+                                return 0;
                         }
-                        eventcnt++;
+                        esed->res++;
                         uevent++;
                         if (epi->event.events & EPOLLONESHOT)
                                 epi->event.events &= EP_PRIVATE_BITS;
@@ -1689,7 +1693,7 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
                 }
         }
 
-        return eventcnt;
+        return 0;
 }
 
 static int ep_send_events(struct eventpoll *ep,
@@ -1700,7 +1704,8 @@ static int ep_send_events(struct eventpoll *ep,
         esed.maxevents = maxevents;
         esed.events = events;
 
-        return ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0, false);
+        ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0, false);
+        return esed.res;
 }
 
 static inline struct timespec64 ep_set_mstimeout(long ms)
diff --git a/fs/fcntl.c b/fs/fcntl.c
index e95fa0a352ea..4fc731876d6b 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -26,7 +26,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/compat.h>
 
-#include <asm/poll.h>
+#include <linux/poll.h>
 #include <asm/siginfo.h>
 #include <linux/uaccess.h>