mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -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
|
|
@ -71,7 +71,7 @@ struct workqueue_struct *user_dlm_worker;
|
|||
* Over time, dlmfs has added some features that were not part of the
|
||||
* initial ABI. Unfortunately, some of these features are not detectable
|
||||
* via standard usage. For example, Linux's default poll always returns
|
||||
* POLLIN, so there is no way for a caller of poll(2) to know when dlmfs
|
||||
* EPOLLIN, so there is no way for a caller of poll(2) to know when dlmfs
|
||||
* added poll support. Instead, we provide this list of new capabilities.
|
||||
*
|
||||
* Capabilities is a read-only attribute. We do it as a module parameter
|
||||
|
|
@ -83,7 +83,7 @@ struct workqueue_struct *user_dlm_worker;
|
|||
* interaction.
|
||||
*
|
||||
* Capabilities:
|
||||
* - bast : POLLIN against the file descriptor of a held lock
|
||||
* - bast : EPOLLIN against the file descriptor of a held lock
|
||||
* signifies a bast fired on the lock.
|
||||
*/
|
||||
#define DLMFS_CAPABILITIES "bast stackglue"
|
||||
|
|
@ -230,7 +230,7 @@ static __poll_t dlmfs_file_poll(struct file *file, poll_table *wait)
|
|||
|
||||
spin_lock(&ip->ip_lockres.l_lock);
|
||||
if (ip->ip_lockres.l_flags & USER_LOCK_BLOCKED)
|
||||
event = POLLIN | POLLRDNORM;
|
||||
event = EPOLLIN | EPOLLRDNORM;
|
||||
spin_unlock(&ip->ip_lockres.l_lock);
|
||||
|
||||
return event;
|
||||
|
|
|
|||
Loading…
Reference in a new issue