diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-29 19:00:41 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-29 19:00:41 -0500 |
| commit | c71d227fc4133f949dae620ed5e3a250b43f2415 (patch) | |
| tree | ce12b907996c2acd37e9d86f4ba492b09a0ab0f8 /fs/fuse | |
| parent | 69112736e2f025ff3ba280cf81c36e25cf7cc59f (diff) | |
| download | linux-c71d227fc4133f949dae620ed5e3a250b43f2415.tar.bz2 | |
make kernel-side POLL... arch-independent
mangle/demangle on the way to/from userland
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index fa4ca6bd2c96..e85e974dd211 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2764,7 +2764,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait) return DEFAULT_POLLMASK; poll_wait(file, &ff->poll_wait, wait); - inarg.events = (__u32)poll_requested_events(wait); + inarg.events = mangle_poll(poll_requested_events(wait)); /* * Ask for notification iff there's someone waiting for it. @@ -2786,7 +2786,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait) err = fuse_simple_request(fc, &args); if (!err) - return outarg.revents; + return demangle_poll(outarg.revents); if (err == -ENOSYS) { fc->no_poll = 1; return DEFAULT_POLLMASK; |