mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -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
|
|
@ -456,14 +456,14 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head)
|
|||
* @file: Pointer to "struct file".
|
||||
* @wait: Pointer to "poll_table". Maybe NULL.
|
||||
*
|
||||
* Returns POLLIN | POLLRDNORM when ready to read an audit log.
|
||||
* Returns EPOLLIN | EPOLLRDNORM when ready to read an audit log.
|
||||
*/
|
||||
__poll_t tomoyo_poll_log(struct file *file, poll_table *wait)
|
||||
{
|
||||
if (tomoyo_log_count)
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
poll_wait(file, &tomoyo_log_wait, wait);
|
||||
if (tomoyo_log_count)
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2116,17 +2116,17 @@ static struct tomoyo_domain_info *tomoyo_find_domain_by_qid
|
|||
* @file: Pointer to "struct file".
|
||||
* @wait: Pointer to "poll_table".
|
||||
*
|
||||
* Returns POLLIN | POLLRDNORM when ready to read, 0 otherwise.
|
||||
* Returns EPOLLIN | EPOLLRDNORM when ready to read, 0 otherwise.
|
||||
*
|
||||
* Waits for access requests which violated policy in enforcing mode.
|
||||
*/
|
||||
static __poll_t tomoyo_poll_query(struct file *file, poll_table *wait)
|
||||
{
|
||||
if (!list_empty(&tomoyo_query_list))
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
poll_wait(file, &tomoyo_query_wait, wait);
|
||||
if (!list_empty(&tomoyo_query_list))
|
||||
return POLLIN | POLLRDNORM;
|
||||
return EPOLLIN | EPOLLRDNORM;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2450,15 +2450,15 @@ int tomoyo_open_control(const u8 type, struct file *file)
|
|||
* @file: Pointer to "struct file".
|
||||
* @wait: Pointer to "poll_table". Maybe NULL.
|
||||
*
|
||||
* Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
|
||||
* POLLOUT | POLLWRNORM otherwise.
|
||||
* Returns EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM if ready to read/write,
|
||||
* EPOLLOUT | EPOLLWRNORM otherwise.
|
||||
*/
|
||||
__poll_t tomoyo_poll_control(struct file *file, poll_table *wait)
|
||||
{
|
||||
struct tomoyo_io_buffer *head = file->private_data;
|
||||
if (head->poll)
|
||||
return head->poll(file, wait) | POLLOUT | POLLWRNORM;
|
||||
return POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
|
||||
return head->poll(file, wait) | EPOLLOUT | EPOLLWRNORM;
|
||||
return EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -154,8 +154,8 @@ static int tomoyo_release(struct inode *inode, struct file *file)
|
|||
* @file: Pointer to "struct file".
|
||||
* @wait: Pointer to "poll_table". Maybe NULL.
|
||||
*
|
||||
* Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
|
||||
* POLLOUT | POLLWRNORM otherwise.
|
||||
* Returns EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM if ready to read/write,
|
||||
* EPOLLOUT | EPOLLWRNORM otherwise.
|
||||
*/
|
||||
static __poll_t tomoyo_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue