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>
This commit is contained in:
@@ -1010,7 +1010,7 @@ __unlock_ret:
|
||||
}
|
||||
|
||||
/*
|
||||
* We return POLLIN | POLLOUT from poll when new buffers are enqueued, and
|
||||
* We return EPOLLIN | EPOLLOUT from poll when new buffers are enqueued, and
|
||||
* not when previously enqueued buffers may be available. This means that
|
||||
* in the card->host (TX) path, when userspace is unblocked by poll it
|
||||
* must drain all available descriptors or it can stall.
|
||||
@@ -1022,15 +1022,15 @@ static __poll_t vop_poll(struct file *f, poll_table *wait)
|
||||
|
||||
mutex_lock(&vdev->vdev_mutex);
|
||||
if (vop_vdev_inited(vdev)) {
|
||||
mask = POLLERR;
|
||||
mask = EPOLLERR;
|
||||
goto done;
|
||||
}
|
||||
poll_wait(f, &vdev->waitq, wait);
|
||||
if (vop_vdev_inited(vdev)) {
|
||||
mask = POLLERR;
|
||||
mask = EPOLLERR;
|
||||
} else if (vdev->poll_wake) {
|
||||
vdev->poll_wake = 0;
|
||||
mask = POLLIN | POLLOUT;
|
||||
mask = EPOLLIN | EPOLLOUT;
|
||||
}
|
||||
done:
|
||||
mutex_unlock(&vdev->vdev_mutex);
|
||||
|
Reference in New Issue
Block a user