diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-17 04:14:00 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-28 17:07:12 +0100 |
| commit | 5dc533c66b131726a1a747eb3c92b20a9ede9219 (patch) | |
| tree | cf622707aa1a425ebfa9863ed43b38927f68df65 | |
| parent | ring_buffer_poll_wait() return value used as return value of ->poll() (diff) | |
| download | linux-5dc533c66b131726a1a747eb3c92b20a9ede9219.tar.xz linux-5dc533c66b131726a1a747eb3c92b20a9ede9219.zip | |
->si_band gets POLL... bitmap stored into a user-visible long field
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/fcntl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 0522e283a4f4..afe731c7a5a8 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -690,7 +690,7 @@ COMPAT_SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, /* Table to convert sigio signal codes into poll band bitmaps */ -static const long band_table[NSIGPOLL] = { +static const __poll_t band_table[NSIGPOLL] = { POLLIN | POLLRDNORM, /* POLL_IN */ POLLOUT | POLLWRNORM | POLLWRBAND, /* POLL_OUT */ POLLIN | POLLRDNORM | POLLMSG, /* POLL_MSG */ @@ -758,7 +758,7 @@ static void send_sigio_to_task(struct task_struct *p, if (reason - POLL_IN >= NSIGPOLL) si.si_band = ~0L; else - si.si_band = band_table[reason - POLL_IN]; + si.si_band = (__force long)band_table[reason - POLL_IN]; si.si_fd = fd; if (!do_send_sig_info(signum, &si, p, group)) break; |