diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-03 22:25:56 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-27 16:19:53 -0500 |
| commit | e6c8adca20ba459dd88057ca74232bf9f1045075 (patch) | |
| tree | 708ae6987fcd37a5a757825aeb84c74843809999 /fs | |
| parent | a3f8683bf7d5e6254fe68f5c5d3585e27eea8ed0 (diff) | |
anntotate the places where ->poll() return values go
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/debugfs/file.c | 2 | ||||
| -rw-r--r-- | fs/proc/inode.c | 2 | ||||
| -rw-r--r-- | fs/select.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index cd12e6576b48..2571404a072b 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c @@ -210,7 +210,7 @@ static unsigned int full_proxy_poll(struct file *filp, struct poll_table_struct *wait) { struct dentry *dentry = F_DENTRY(filp); - unsigned int r = 0; + __poll_t r = 0; const struct file_operations *real_fops; if (debugfs_file_get(dentry)) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 44e37f38493b..149fd4d75db6 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -237,7 +237,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts) { struct proc_dir_entry *pde = PDE(file_inode(file)); - unsigned int rv = DEFAULT_POLLMASK; + __poll_t rv = DEFAULT_POLLMASK; __poll_t (*poll)(struct file *, struct poll_table_struct *); if (use_pde(pde)) { poll = pde->proc_fops->poll; diff --git a/fs/select.c b/fs/select.c index 6de493bb42a4..b2bf84be5056 100644 --- a/fs/select.c +++ b/fs/select.c @@ -484,8 +484,9 @@ static int do_select(int n, fd_set_bits *fds, struct timespec64 *end_time) rinp = fds->res_in; routp = fds->res_out; rexp = fds->res_ex; for (i = 0; i < n; ++rinp, ++routp, ++rexp) { - unsigned long in, out, ex, all_bits, bit = 1, mask, j; + unsigned long in, out, ex, all_bits, bit = 1, j; unsigned long res_in = 0, res_out = 0, res_ex = 0; + __poll_t mask; in = *inp++; out = *outp++; ex = *exp++; all_bits = in | out | ex; @@ -806,7 +807,7 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait, bool *can_busy_poll, unsigned int busy_flag) { - unsigned int mask; + __poll_t mask; int fd; mask = 0; |