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:
@@ -644,7 +644,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value)
|
||||
static __poll_t ffs_ep0_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
struct ffs_data *ffs = file->private_data;
|
||||
__poll_t mask = POLLWRNORM;
|
||||
__poll_t mask = EPOLLWRNORM;
|
||||
int ret;
|
||||
|
||||
poll_wait(file, &ffs->ev.waitq, wait);
|
||||
@@ -656,19 +656,19 @@ static __poll_t ffs_ep0_poll(struct file *file, poll_table *wait)
|
||||
switch (ffs->state) {
|
||||
case FFS_READ_DESCRIPTORS:
|
||||
case FFS_READ_STRINGS:
|
||||
mask |= POLLOUT;
|
||||
mask |= EPOLLOUT;
|
||||
break;
|
||||
|
||||
case FFS_ACTIVE:
|
||||
switch (ffs->setup_state) {
|
||||
case FFS_NO_SETUP:
|
||||
if (ffs->ev.count)
|
||||
mask |= POLLIN;
|
||||
mask |= EPOLLIN;
|
||||
break;
|
||||
|
||||
case FFS_SETUP_PENDING:
|
||||
case FFS_SETUP_CANCELLED:
|
||||
mask |= (POLLIN | POLLOUT);
|
||||
mask |= (EPOLLIN | EPOLLOUT);
|
||||
break;
|
||||
}
|
||||
case FFS_CLOSING:
|
||||
|
@@ -422,10 +422,10 @@ static __poll_t f_hidg_poll(struct file *file, poll_table *wait)
|
||||
poll_wait(file, &hidg->write_queue, wait);
|
||||
|
||||
if (WRITE_COND)
|
||||
ret |= POLLOUT | POLLWRNORM;
|
||||
ret |= EPOLLOUT | EPOLLWRNORM;
|
||||
|
||||
if (READ_COND)
|
||||
ret |= POLLIN | POLLRDNORM;
|
||||
ret |= EPOLLIN | EPOLLRDNORM;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@@ -698,11 +698,11 @@ printer_poll(struct file *fd, poll_table *wait)
|
||||
|
||||
spin_lock_irqsave(&dev->lock, flags);
|
||||
if (likely(!list_empty(&dev->tx_reqs)))
|
||||
status |= POLLOUT | POLLWRNORM;
|
||||
status |= EPOLLOUT | EPOLLWRNORM;
|
||||
|
||||
if (likely(dev->current_rx_bytes) ||
|
||||
likely(!list_empty(&dev->rx_buffers)))
|
||||
status |= POLLIN | POLLRDNORM;
|
||||
status |= EPOLLIN | EPOLLRDNORM;
|
||||
|
||||
spin_unlock_irqrestore(&dev->lock, flags);
|
||||
|
||||
|
@@ -1225,16 +1225,16 @@ ep0_poll (struct file *fd, poll_table *wait)
|
||||
/* report fd mode change before acting on it */
|
||||
if (dev->setup_abort) {
|
||||
dev->setup_abort = 0;
|
||||
mask = POLLHUP;
|
||||
mask = EPOLLHUP;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (dev->state == STATE_DEV_SETUP) {
|
||||
if (dev->setup_in || dev->setup_can_stall)
|
||||
mask = POLLOUT;
|
||||
mask = EPOLLOUT;
|
||||
} else {
|
||||
if (dev->ev_next != 0)
|
||||
mask = POLLIN;
|
||||
mask = EPOLLIN;
|
||||
}
|
||||
out:
|
||||
spin_unlock_irq(&dev->lock);
|
||||
|
Reference in New Issue
Block a user