Skip to content

Commit 076ccb7

Browse files
author
Al Viro
committed
fs: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 9dd9574 commit 076ccb7

24 files changed

+41
-41
lines changed

‎fs/cachefiles/daemon.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static ssize_t cachefiles_daemon_read(struct file *, char __user *, size_t,
3131
loff_t *);
3232
static ssize_t cachefiles_daemon_write(struct file *, const char __user *,
3333
size_t, loff_t *);
34-
static unsigned int cachefiles_daemon_poll(struct file *,
34+
static __poll_t cachefiles_daemon_poll(struct file *,
3535
struct poll_table_struct *);
3636
static int cachefiles_daemon_frun(struct cachefiles_cache *, char *);
3737
static int cachefiles_daemon_fcull(struct cachefiles_cache *, char *);
@@ -291,11 +291,11 @@ static ssize_t cachefiles_daemon_write(struct file *file,
291291
* poll for culling state
292292
* - use POLLOUT to indicate culling state
293293
*/
294-
static unsigned int cachefiles_daemon_poll(struct file *file,
294+
static __poll_t cachefiles_daemon_poll(struct file *file,
295295
struct poll_table_struct *poll)
296296
{
297297
struct cachefiles_cache *cache = file->private_data;
298-
unsigned int mask;
298+
__poll_t mask;
299299

300300
poll_wait(file, &cache->daemon_pollwq, poll);
301301
mask = 0;

‎fs/coda/psdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ static struct class *coda_psdev_class;
6161
* Device operations
6262
*/
6363

64-
static unsigned int coda_psdev_poll(struct file *file, poll_table * wait)
64+
static __poll_t coda_psdev_poll(struct file *file, poll_table * wait)
6565
{
6666
struct venus_comm *vcp = (struct venus_comm *) file->private_data;
67-
unsigned int mask = POLLOUT | POLLWRNORM;
67+
__poll_t mask = POLLOUT | POLLWRNORM;
6868

6969
poll_wait(file, &vcp->vc_waitq, wait);
7070
mutex_lock(&vcp->vc_mutex);

‎fs/debugfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ FULL_PROXY_FUNC(unlocked_ioctl, long, filp,
206206
PROTO(struct file *filp, unsigned int cmd, unsigned long arg),
207207
ARGS(filp, cmd, arg));
208208

209-
static unsigned int full_proxy_poll(struct file *filp,
209+
static __poll_t full_proxy_poll(struct file *filp,
210210
struct poll_table_struct *wait)
211211
{
212212
struct dentry *dentry = F_DENTRY(filp);

‎fs/dlm/plock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
463463
return count;
464464
}
465465

466-
static unsigned int dev_poll(struct file *file, poll_table *wait)
466+
static __poll_t dev_poll(struct file *file, poll_table *wait)
467467
{
468-
unsigned int mask = 0;
468+
__poll_t mask = 0;
469469

470470
poll_wait(file, &send_wq, wait);
471471

‎fs/dlm/user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,
887887
return rv;
888888
}
889889

890-
static unsigned int device_poll(struct file *file, poll_table *wait)
890+
static __poll_t device_poll(struct file *file, poll_table *wait)
891891
{
892892
struct dlm_user_proc *proc = file->private_data;
893893

‎fs/ecryptfs/miscdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ static atomic_t ecryptfs_num_miscdev_opens;
3838
*
3939
* Returns the poll mask
4040
*/
41-
static unsigned int
41+
static __poll_t
4242
ecryptfs_miscdev_poll(struct file *file, poll_table *pt)
4343
{
4444
struct ecryptfs_daemon *daemon = file->private_data;
45-
unsigned int mask = 0;
45+
__poll_t mask = 0;
4646

4747
mutex_lock(&daemon->mux);
4848
if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) {

‎fs/eventfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ static int eventfd_release(struct inode *inode, struct file *file)
114114
return 0;
115115
}
116116

117-
static unsigned int eventfd_poll(struct file *file, poll_table *wait)
117+
static __poll_t eventfd_poll(struct file *file, poll_table *wait)
118118
{
119119
struct eventfd_ctx *ctx = file->private_data;
120-
unsigned int events = 0;
120+
__poll_t events = 0;
121121
u64 count;
122122

123123
poll_wait(file, &ctx->wqh, wait);

‎fs/eventpoll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
920920
return 0;
921921
}
922922

923-
static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
923+
static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)
924924
{
925925
struct eventpoll *ep = file->private_data;
926926
int depth = 0;

‎fs/fuse/dev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,9 +2004,9 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
20042004
return ret;
20052005
}
20062006

2007-
static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
2007+
static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)
20082008
{
2009-
unsigned mask = POLLOUT | POLLWRNORM;
2009+
__poll_t mask = POLLOUT | POLLWRNORM;
20102010
struct fuse_iqueue *fiq;
20112011
struct fuse_dev *fud = fuse_get_dev(file);
20122012

‎fs/fuse/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2751,7 +2751,7 @@ static void fuse_register_polled_file(struct fuse_conn *fc,
27512751
spin_unlock(&fc->lock);
27522752
}
27532753

2754-
unsigned fuse_file_poll(struct file *file, poll_table *wait)
2754+
__poll_t fuse_file_poll(struct file *file, poll_table *wait)
27552755
{
27562756
struct fuse_file *ff = file->private_data;
27572757
struct fuse_conn *fc = ff->fc;

‎fs/fuse/fuse_i.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
951951
unsigned int flags);
952952
long fuse_ioctl_common(struct file *file, unsigned int cmd,
953953
unsigned long arg, unsigned int flags);
954-
unsigned fuse_file_poll(struct file *file, poll_table *wait);
954+
__poll_t fuse_file_poll(struct file *file, poll_table *wait);
955955
int fuse_dev_release(struct inode *inode, struct file *file);
956956

957957
bool fuse_write_update_size(struct inode *inode, loff_t pos);

‎fs/kernfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
832832
* to see if it supports poll (Neither 'poll' nor 'select' return
833833
* an appropriate error code). When in doubt, set a suitable timeout value.
834834
*/
835-
static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
835+
static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)
836836
{
837837
struct kernfs_open_file *of = kernfs_of(filp);
838838
struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry);

‎fs/notify/fanotify/fanotify_user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
239239
}
240240

241241
/* intofiy userspace file descriptor functions */
242-
static unsigned int fanotify_poll(struct file *file, poll_table *wait)
242+
static __poll_t fanotify_poll(struct file *file, poll_table *wait)
243243
{
244244
struct fsnotify_group *group = file->private_data;
245-
int ret = 0;
245+
__poll_t ret = 0;
246246

247247
poll_wait(file, &group->notification_waitq, wait);
248248
spin_lock(&group->notification_lock);

‎fs/notify/inotify/inotify_user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ static inline u32 inotify_mask_to_arg(__u32 mask)
107107
}
108108

109109
/* intofiy userspace file descriptor functions */
110-
static unsigned int inotify_poll(struct file *file, poll_table *wait)
110+
static __poll_t inotify_poll(struct file *file, poll_table *wait)
111111
{
112112
struct fsnotify_group *group = file->private_data;
113-
int ret = 0;
113+
__poll_t ret = 0;
114114

115115
poll_wait(file, &group->notification_waitq, wait);
116116
spin_lock(&group->notification_lock);

‎fs/ocfs2/dlmfs/dlmfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ static int dlmfs_file_setattr(struct dentry *dentry, struct iattr *attr)
220220
return 0;
221221
}
222222

223-
static unsigned int dlmfs_file_poll(struct file *file, poll_table *wait)
223+
static __poll_t dlmfs_file_poll(struct file *file, poll_table *wait)
224224
{
225-
int event = 0;
225+
__poll_t event = 0;
226226
struct inode *inode = file_inode(file);
227227
struct dlmfs_inode_private *ip = DLMFS_I(inode);
228228

‎fs/orangefs/devorangefs-req.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,10 +814,10 @@ void orangefs_dev_cleanup(void)
814814
ORANGEFS_REQDEVICE_NAME);
815815
}
816816

817-
static unsigned int orangefs_devreq_poll(struct file *file,
817+
static __poll_t orangefs_devreq_poll(struct file *file,
818818
struct poll_table_struct *poll_table)
819819
{
820-
int poll_revent_mask = 0;
820+
__poll_t poll_revent_mask = 0;
821821

822822
poll_wait(file, &orangefs_request_list_waitq, poll_table);
823823

‎fs/pipe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,10 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
515515
}
516516

517517
/* No kernel lock held - fine */
518-
static unsigned int
518+
static __poll_t
519519
pipe_poll(struct file *filp, poll_table *wait)
520520
{
521-
unsigned int mask;
521+
__poll_t mask;
522522
struct pipe_inode_info *pipe = filp->private_data;
523523
int nrbufs;
524524

‎fs/proc/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
234234
return rv;
235235
}
236236

237-
static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
237+
static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)
238238
{
239239
struct proc_dir_entry *pde = PDE(file_inode(file));
240240
__poll_t rv = DEFAULT_POLLMASK;

‎fs/proc/kmsg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static ssize_t kmsg_read(struct file *file, char __user *buf,
4040
return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_PROC);
4141
}
4242

43-
static unsigned int kmsg_poll(struct file *file, poll_table *wait)
43+
static __poll_t kmsg_poll(struct file *file, poll_table *wait)
4444
{
4545
poll_wait(file, &log_wait, wait);
4646
if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))

‎fs/proc/proc_sysctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,12 @@ static int proc_sys_open(struct inode *inode, struct file *filp)
630630
return 0;
631631
}
632632

633-
static unsigned int proc_sys_poll(struct file *filp, poll_table *wait)
633+
static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)
634634
{
635635
struct inode *inode = file_inode(filp);
636636
struct ctl_table_header *head = grab_header(inode);
637637
struct ctl_table *table = PROC_I(inode)->sysctl_entry;
638-
unsigned int ret = DEFAULT_POLLMASK;
638+
__poll_t ret = DEFAULT_POLLMASK;
639639
unsigned long event;
640640

641641
/* sysctl was unregistered */

‎fs/proc_namespace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include "pnode.h"
1919
#include "internal.h"
2020

21-
static unsigned mounts_poll(struct file *file, poll_table *wait)
21+
static __poll_t mounts_poll(struct file *file, poll_table *wait)
2222
{
2323
struct seq_file *m = file->private_data;
2424
struct proc_mounts *p = m->private;
2525
struct mnt_namespace *ns = p->ns;
26-
unsigned res = POLLIN | POLLRDNORM;
26+
__poll_t res = POLLIN | POLLRDNORM;
2727
int event;
2828

2929
poll_wait(file, &p->ns->poll, wait);

‎fs/signalfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ static int signalfd_release(struct inode *inode, struct file *file)
5858
return 0;
5959
}
6060

61-
static unsigned int signalfd_poll(struct file *file, poll_table *wait)
61+
static __poll_t signalfd_poll(struct file *file, poll_table *wait)
6262
{
6363
struct signalfd_ctx *ctx = file->private_data;
64-
unsigned int events = 0;
64+
__poll_t events = 0;
6565

6666
poll_wait(file, &current->sighand->signalfd_wqh, wait);
6767

‎fs/timerfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ static int timerfd_release(struct inode *inode, struct file *file)
227227
return 0;
228228
}
229229

230-
static unsigned int timerfd_poll(struct file *file, poll_table *wait)
230+
static __poll_t timerfd_poll(struct file *file, poll_table *wait)
231231
{
232232
struct timerfd_ctx *ctx = file->private_data;
233-
unsigned int events = 0;
233+
__poll_t events = 0;
234234
unsigned long flags;
235235

236236
poll_wait(file, &ctx->wqh, wait);

‎fs/userfaultfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,10 +921,10 @@ static inline struct userfaultfd_wait_queue *find_userfault_evt(
921921
return find_userfault_in(&ctx->event_wqh);
922922
}
923923

924-
static unsigned int userfaultfd_poll(struct file *file, poll_table *wait)
924+
static __poll_t userfaultfd_poll(struct file *file, poll_table *wait)
925925
{
926926
struct userfaultfd_ctx *ctx = file->private_data;
927-
unsigned int ret;
927+
__poll_t ret;
928928

929929
poll_wait(file, &ctx->fd_wqh, wait);
930930

0 commit comments

Comments
 (0)