summaryrefslogtreecommitdiffstats
path: root/fs/select.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-07-04 04:25:56 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-27 22:19:53 +0100
commite6c8adca20ba459dd88057ca74232bf9f1045075 (patch)
tree708ae6987fcd37a5a757825aeb84c74843809999 /fs/select.c
parent->poll() methods should return __poll_t (diff)
downloadlinux-e6c8adca20ba459dd88057ca74232bf9f1045075.tar.xz
linux-e6c8adca20ba459dd88057ca74232bf9f1045075.zip
anntotate the places where ->poll() return values go
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/select.c')
-rw-r--r--fs/select.c5
1 files changed, 3 insertions, 2 deletions
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;