fs: annotate ->poll() instances

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 1ee54ffd3a248d1cd279c6bc7fe69be40ac01353..7edbd0679952080109d8ac7eaf4df23067d266f2 100644 (file)
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -31,7 +31,7 @@ static ssize_t cachefiles_daemon_read(struct file *, char __user *, size_t,
                                      loff_t *);
 static ssize_t cachefiles_daemon_write(struct file *, const char __user *,
                                       size_t, loff_t *);
-static unsigned int cachefiles_daemon_poll(struct file *,
+static __poll_t cachefiles_daemon_poll(struct file *,
                                           struct poll_table_struct *);
 static int cachefiles_daemon_frun(struct cachefiles_cache *, char *);
 static int cachefiles_daemon_fcull(struct cachefiles_cache *, char *);
@@ -291,11 +291,11 @@ found_command:
  * poll for culling state
  * - use POLLOUT to indicate culling state
  */
-static unsigned int cachefiles_daemon_poll(struct file *file,
+static __poll_t cachefiles_daemon_poll(struct file *file,
                                           struct poll_table_struct *poll)
 {
        struct cachefiles_cache *cache = file->private_data;
-       unsigned int mask;
+       __poll_t mask;
 
        poll_wait(file, &cache->daemon_pollwq, poll);
        mask = 0;

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index f40e3953e7fe3cfe63599779fab8810d3762e11a..49d3c6fda89a08106228b844b8eb4bd65730f693 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -61,10 +61,10 @@ static struct class *coda_psdev_class;
  * Device operations
  */
 
-static unsigned int coda_psdev_poll(struct file *file, poll_table * wait)
+static __poll_t coda_psdev_poll(struct file *file, poll_table * wait)
 {
         struct venus_comm *vcp = (struct venus_comm *) file->private_data;
-       unsigned int mask = POLLOUT | POLLWRNORM;
+       __poll_t mask = POLLOUT | POLLWRNORM;
 
        poll_wait(file, &vcp->vc_waitq, wait);
        mutex_lock(&vcp->vc_mutex);

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 2571404a072bde5838c87320c5104a4f3f4ae5bc..6fdbf21be31843c34cdf869a7c30e1a1fe1beea3 100644 (file)
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -206,7 +206,7 @@ FULL_PROXY_FUNC(unlocked_ioctl, long, filp,
                PROTO(struct file *filp, unsigned int cmd, unsigned long arg),
                ARGS(filp, cmd, arg));
 
-static unsigned int full_proxy_poll(struct file *filp,
+static __poll_t full_proxy_poll(struct file *filp,
                                struct poll_table_struct *wait)
 {
        struct dentry *dentry = F_DENTRY(filp);

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index e631b16892287064d449f658fd8e3a1e3aa2edff..a4c63e9e638545a916fd1d25ed8058e1d77acad9 100644 (file)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -463,9 +463,9 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
        return count;
 }
 
-static unsigned int dev_poll(struct file *file, poll_table *wait)
+static __poll_t dev_poll(struct file *file, poll_table *wait)
 {
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        poll_wait(file, &send_wq, wait);
 

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index d18e7a539f116209e3a7d0a972d7ca4a28522a09..662432af8ce8845dd303975a49df3b7e62e32e2d 100644 (file)
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -887,7 +887,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,
        return rv;
 }
 
-static unsigned int device_poll(struct file *file, poll_table *wait)
+static __poll_t device_poll(struct file *file, poll_table *wait)
 {
        struct dlm_user_proc *proc = file->private_data;
 

diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index f09cacaf8c80cff375d26d299bb5caa17ec5a0c8..7423e792a092eb13c36da4809331eebaad32f23c 100644 (file)
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -38,11 +38,11 @@ static atomic_t ecryptfs_num_miscdev_opens;
  *
  * Returns the poll mask
  */
-static unsigned int
+static __poll_t
 ecryptfs_miscdev_poll(struct file *file, poll_table *pt)
 {
        struct ecryptfs_daemon *daemon = file->private_data;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        mutex_lock(&daemon->mux);
        if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) {

diff --git a/fs/eventfd.c b/fs/eventfd.c
index 2fb4eadaa1181e4c4f4178b7269c20f58b03a376..6318a9b57e53a9add1f2e41cd38c5adb71bc206a 100644 (file)
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -114,10 +114,10 @@ static int eventfd_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static unsigned int eventfd_poll(struct file *file, poll_table *wait)
+static __poll_t eventfd_poll(struct file *file, poll_table *wait)
 {
        struct eventfd_ctx *ctx = file->private_data;
-       unsigned int events = 0;
+       __poll_t events = 0;
        u64 count;
 
        poll_wait(file, &ctx->wqh, wait);

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 21e6fee00e8b2e0c2170abab159af06fd0407b00..67fb3b850c99a1c0a24e9f57e9550ba37daba4a1 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -920,7 +920,7 @@ static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
        return 0;
 }
 
-static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
+static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)
 {
        struct eventpoll *ep = file->private_data;
        int depth = 0;

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 17f0d05bfd4c4b4dc9a877832ac3d7f88f0acbaa..aa089a6925d0ea6bfa3d3104305084b240e35bc4 100644 (file)
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -2004,9 +2004,9 @@ out:
        return ret;
 }
 
-static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
+static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)
 {
-       unsigned mask = POLLOUT | POLLWRNORM;
+       __poll_t mask = POLLOUT | POLLWRNORM;
        struct fuse_iqueue *fiq;
        struct fuse_dev *fud = fuse_get_dev(file);
 

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index cb7dff5c45d767991698058d8d52027572ebea41..fa4ca6bd2c966f1e38501be1b40751ac8656c6a1 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2751,7 +2751,7 @@ static void fuse_register_polled_file(struct fuse_conn *fc,
        spin_unlock(&fc->lock);
 }
 
-unsigned fuse_file_poll(struct file *file, poll_table *wait)
+__poll_t fuse_file_poll(struct file *file, poll_table *wait)
 {
        struct fuse_file *ff = file->private_data;
        struct fuse_conn *fc = ff->fc;

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index d5773ca67ad2bbc36155a30fafa596dd7e44502a..c4c093bbf456bff71568876955c52bb74e675d50 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -951,7 +951,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
                   unsigned int flags);
 long fuse_ioctl_common(struct file *file, unsigned int cmd,
                       unsigned long arg, unsigned int flags);
-unsigned fuse_file_poll(struct file *file, poll_table *wait);
+__poll_t fuse_file_poll(struct file *file, poll_table *wait);
 int fuse_dev_release(struct inode *inode, struct file *file);
 
 bool fuse_write_update_size(struct inode *inode, loff_t pos);

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 9698e51656b10b52c7aafccb4a1d5d545eb9acba..c53d9cc5ae7a4eaf2a40f69305bf96928b3f3f8b 100644 (file)
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -832,7 +832,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
  * to see if it supports poll (Neither 'poll' nor 'select' return
  * an appropriate error code).  When in doubt, set a suitable timeout value.
  */
-static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
+static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)
 {
        struct kernfs_open_file *of = kernfs_of(filp);
        struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry);

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index d0d4bc4c4b70670f9221f61ad3b21337d1e9b19f..ef08d64c84b8659d9d44e6febb9db5b0ad7dca91 100644 (file)
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -239,10 +239,10 @@ out_close_fd:
 }
 
 /* intofiy userspace file descriptor functions */
-static unsigned int fanotify_poll(struct file *file, poll_table *wait)
+static __poll_t fanotify_poll(struct file *file, poll_table *wait)
 {
        struct fsnotify_group *group = file->private_data;
-       int ret = 0;
+       __poll_t ret = 0;
 
        poll_wait(file, &group->notification_waitq, wait);
        spin_lock(&group->notification_lock);

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index d3c20e0bb046d21c33c0b0a9e712c571f49b690c..5c29bf16814f48633d57a5537c9ba9134c09e4df 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -107,10 +107,10 @@ static inline u32 inotify_mask_to_arg(__u32 mask)
 }
 
 /* intofiy userspace file descriptor functions */
-static unsigned int inotify_poll(struct file *file, poll_table *wait)
+static __poll_t inotify_poll(struct file *file, poll_table *wait)
 {
        struct fsnotify_group *group = file->private_data;
-       int ret = 0;
+       __poll_t ret = 0;
 
        poll_wait(file, &group->notification_waitq, wait);
        spin_lock(&group->notification_lock);

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 9c7c18c0e129ea3d6b86e8a896102c7bbbe9af99..385fcefa8bc53ec6db840fde60eefe30d91cf282 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -220,9 +220,9 @@ static int dlmfs_file_setattr(struct dentry *dentry, struct iattr *attr)
        return 0;
 }
 
-static unsigned int dlmfs_file_poll(struct file *file, poll_table *wait)
+static __poll_t dlmfs_file_poll(struct file *file, poll_table *wait)
 {
-       int event = 0;
+       __poll_t event = 0;
        struct inode *inode = file_inode(file);
        struct dlmfs_inode_private *ip = DLMFS_I(inode);
 

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index a324dc584bf72b4cc068e7307b6df2befae77e61..109fffd6d153c3b221e796a9a3b1cb22d306c2de 100644 (file)
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -814,10 +814,10 @@ void orangefs_dev_cleanup(void)
                     ORANGEFS_REQDEVICE_NAME);
 }
 
-static unsigned int orangefs_devreq_poll(struct file *file,
+static __poll_t orangefs_devreq_poll(struct file *file,
                                      struct poll_table_struct *poll_table)
 {
-       int poll_revent_mask = 0;
+       __poll_t poll_revent_mask = 0;
 
        poll_wait(file, &orangefs_request_list_waitq, poll_table);
 

diff --git a/fs/pipe.c b/fs/pipe.c
index 6d98566201ef5c1f152a11c5849e9e02bd55189b..a449ca0ec0c61fe37a7cef9bf817c570e8324691 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -515,10 +515,10 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 }
 
 /* No kernel lock held - fine */
-static unsigned int
+static __poll_t
 pipe_poll(struct file *filp, poll_table *wait)
 {
-       unsigned int mask;
+       __poll_t mask;
        struct pipe_inode_info *pipe = filp->private_data;
        int nrbufs;
 

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 149fd4d75db66c7dd3389bf8cb827017bec642f5..5e6f160d96a2b1afe4e17770cf6abb0c3d72e23e 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -234,7 +234,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
        return rv;
 }
 
-static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
+static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)
 {
        struct proc_dir_entry *pde = PDE(file_inode(file));
        __poll_t rv = DEFAULT_POLLMASK;

diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index e0f8774acd658a9ea084fded8ce265a2f1efa36f..f0bfb45c3f9fea791d65816efed720e4f21f11a1 100644 (file)
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -40,7 +40,7 @@ static ssize_t kmsg_read(struct file *file, char __user *buf,
        return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_PROC);
 }
 
-static unsigned int kmsg_poll(struct file *file, poll_table *wait)
+static __poll_t kmsg_poll(struct file *file, poll_table *wait)
 {
        poll_wait(file, &log_wait, wait);
        if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index c5cbbdff3c3d683df9b651c457e54cc6ab14f6c4..63325377621a91d814fbc348b4902341b80bee97 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -630,12 +630,12 @@ static int proc_sys_open(struct inode *inode, struct file *filp)
        return 0;
 }
 
-static unsigned int proc_sys_poll(struct file *filp, poll_table *wait)
+static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)
 {
        struct inode *inode = file_inode(filp);
        struct ctl_table_header *head = grab_header(inode);
        struct ctl_table *table = PROC_I(inode)->sysctl_entry;
-       unsigned int ret = DEFAULT_POLLMASK;
+       __poll_t ret = DEFAULT_POLLMASK;
        unsigned long event;
 
        /* sysctl was unregistered */

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 7b635d17321377e4868554a6ad338a1bd413b3cc..7a3d0ff9b7a852d24ed951c403cf8858a94d9a45 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -18,12 +18,12 @@
 #include "pnode.h"
 #include "internal.h"
 
-static unsigned mounts_poll(struct file *file, poll_table *wait)
+static __poll_t mounts_poll(struct file *file, poll_table *wait)
 {
        struct seq_file *m = file->private_data;
        struct proc_mounts *p = m->private;
        struct mnt_namespace *ns = p->ns;
-       unsigned res = POLLIN | POLLRDNORM;
+       __poll_t res = POLLIN | POLLRDNORM;
        int event;
 
        poll_wait(file, &p->ns->poll, wait);

diff --git a/fs/signalfd.c b/fs/signalfd.c
index 5f1ff8756595ee93bd9a13e3a3531a6a937f5d32..31e923bec99af0eabe81414dd167b2d851879e27 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -58,10 +58,10 @@ static int signalfd_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static unsigned int signalfd_poll(struct file *file, poll_table *wait)
+static __poll_t signalfd_poll(struct file *file, poll_table *wait)
 {
        struct signalfd_ctx *ctx = file->private_data;
-       unsigned int events = 0;
+       __poll_t events = 0;
 
        poll_wait(file, &current->sighand->signalfd_wqh, wait);
 

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 040612ec9598310dfec5a706c3d2312da8eb3f12..0510717f3a53525ad47003631c4a3e4c8dce5eb7 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -227,10 +227,10 @@ static int timerfd_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static unsigned int timerfd_poll(struct file *file, poll_table *wait)
+static __poll_t timerfd_poll(struct file *file, poll_table *wait)
 {
        struct timerfd_ctx *ctx = file->private_data;
-       unsigned int events = 0;
+       __poll_t events = 0;
        unsigned long flags;
 
        poll_wait(file, &ctx->wqh, wait);

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index ac9a4e65ca497ad3b673dc50893d13b44150c70f..c0a5d9c47c6d7498aa720413a8de57ac6971217a 100644 (file)
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -921,10 +921,10 @@ static inline struct userfaultfd_wait_queue *find_userfault_evt(
        return find_userfault_in(&ctx->event_wqh);
 }
 
-static unsigned int userfaultfd_poll(struct file *file, poll_table *wait)
+static __poll_t userfaultfd_poll(struct file *file, poll_table *wait)
 {
        struct userfaultfd_ctx *ctx = file->private_data;
-       unsigned int ret;
+       __poll_t ret;
 
        poll_wait(file, &ctx->fd_wqh, wait);