mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ee5daa1361
commit
a9a08845e9
297 changed files with 913 additions and 913 deletions
|
|
@ -623,14 +623,14 @@ static long evtchn_ioctl(struct file *file,
|
|||
|
||||
static __poll_t evtchn_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
__poll_t mask = POLLOUT | POLLWRNORM;
|
||||
__poll_t mask = EPOLLOUT | EPOLLWRNORM;
|
||||
struct per_user_data *u = file->private_data;
|
||||
|
||||
poll_wait(file, &u->evtchn_wait, wait);
|
||||
if (u->ring_cons != u->ring_prod)
|
||||
mask |= POLLIN | POLLRDNORM;
|
||||
mask |= EPOLLIN | EPOLLRDNORM;
|
||||
if (u->ring_overflow)
|
||||
mask = POLLERR;
|
||||
mask = EPOLLERR;
|
||||
return mask;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ static __poll_t xen_mce_chrdev_poll(struct file *file, poll_table *wait)
|
|||
poll_wait(file, &xen_mce_chrdev_wait, wait);
|
||||
|
||||
if (xen_mcelog.next)
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -892,7 +892,7 @@ static __poll_t pvcalls_front_poll_passive(struct file *file,
|
|||
|
||||
if (req_id != PVCALLS_INVALID_ID &&
|
||||
READ_ONCE(bedata->rsp[req_id].req_id) == req_id)
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
|
||||
poll_wait(file, &map->passive.inflight_accept_req, wait);
|
||||
return 0;
|
||||
|
|
@ -900,7 +900,7 @@ static __poll_t pvcalls_front_poll_passive(struct file *file,
|
|||
|
||||
if (test_and_clear_bit(PVCALLS_FLAG_POLL_RET,
|
||||
(void *)&map->passive.flags))
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
|
||||
/*
|
||||
* First check RET, then INFLIGHT. No barriers necessary to
|
||||
|
|
@ -949,11 +949,11 @@ static __poll_t pvcalls_front_poll_active(struct file *file,
|
|||
|
||||
poll_wait(file, &map->active.inflight_conn_req, wait);
|
||||
if (pvcalls_front_write_todo(map))
|
||||
mask |= POLLOUT | POLLWRNORM;
|
||||
mask |= EPOLLOUT | EPOLLWRNORM;
|
||||
if (pvcalls_front_read_todo(map))
|
||||
mask |= POLLIN | POLLRDNORM;
|
||||
mask |= EPOLLIN | EPOLLRDNORM;
|
||||
if (in_error != 0 || out_error != 0)
|
||||
mask |= POLLERR;
|
||||
mask |= EPOLLERR;
|
||||
|
||||
return mask;
|
||||
}
|
||||
|
|
@ -968,14 +968,14 @@ __poll_t pvcalls_front_poll(struct file *file, struct socket *sock,
|
|||
pvcalls_enter();
|
||||
if (!pvcalls_front_dev) {
|
||||
pvcalls_exit();
|
||||
return POLLNVAL;
|
||||
return EPOLLNVAL;
|
||||
}
|
||||
bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
|
||||
|
||||
map = (struct sock_mapping *) sock->sk->sk_send_head;
|
||||
if (!map) {
|
||||
pvcalls_exit();
|
||||
return POLLNVAL;
|
||||
return EPOLLNVAL;
|
||||
}
|
||||
if (map->active_socket)
|
||||
ret = pvcalls_front_poll_active(file, bedata, map, wait);
|
||||
|
|
|
|||
|
|
@ -651,7 +651,7 @@ static __poll_t xenbus_file_poll(struct file *file, poll_table *wait)
|
|||
|
||||
poll_wait(file, &u->read_waitq, wait);
|
||||
if (!list_empty(&u->read_buffers))
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue