summaryrefslogtreecommitdiffstats
path: root/fs/fcntl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-11 17:34:03 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-11 17:34:03 -0500
commita9a08845e9acbd224e4ee466f5c1275ed50054e8 (patch)
tree415d6e6a82e001c65e6b161539411f54ba5fe8ce /fs/fcntl.c
parentee5daa1361fceb6f482c005bcc9ba8d01b92ea5c (diff)
vfs: do bulk POLL* -> EPOLL* replacement
This is the mindless scripted replacement of kernel use of POLL* variables as described by Al, done by this script: for V in IN OUT PRI ERR RDNORM RDBAND WRNORM WRBAND HUP RDHUP NVAL MSG; do L=`git grep -l -w POLL$V | grep -v '^t' | grep -v /um/ | grep -v '^sa' | grep -v '/poll.h$'|grep -v '^D'` for f in $L; do sed -i "-es/^\([^\"]*\)\(\<POLL$V\>\)/\\1E\\2/" $f; done done with de-mangling cleanups yet to come. NOTE! On almost all architectures, the EPOLL* constants have the same values as the POLL* constants do. But they keyword here is "almost". For various bad reasons they aren't the same, and epoll() doesn't actually work quite correctly in some cases due to this on Sparc et al. The next patch from Al will sort out the final differences, and we should be all done. Scripted-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r--fs/fcntl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 4fc731876d6b..1e97f1fda90c 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -691,12 +691,12 @@ COMPAT_SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd,
691/* Table to convert sigio signal codes into poll band bitmaps */ 691/* Table to convert sigio signal codes into poll band bitmaps */
692 692
693static const __poll_t band_table[NSIGPOLL] = { 693static const __poll_t band_table[NSIGPOLL] = {
694 POLLIN | POLLRDNORM, /* POLL_IN */ 694 EPOLLIN | EPOLLRDNORM, /* POLL_IN */
695 POLLOUT | POLLWRNORM | POLLWRBAND, /* POLL_OUT */ 695 EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND, /* POLL_OUT */
696 POLLIN | POLLRDNORM | POLLMSG, /* POLL_MSG */ 696 EPOLLIN | EPOLLRDNORM | EPOLLMSG, /* POLL_MSG */
697 POLLERR, /* POLL_ERR */ 697 EPOLLERR, /* POLL_ERR */
698 POLLPRI | POLLRDBAND, /* POLL_PRI */ 698 EPOLLPRI | EPOLLRDBAND, /* POLL_PRI */
699 POLLHUP | POLLERR /* POLL_HUP */ 699 EPOLLHUP | EPOLLERR /* POLL_HUP */
700}; 700};
701 701
702static inline int sigio_perm(struct task_struct *p, 702static inline int sigio_perm(struct task_struct *p,