diff options
| -rw-r--r-- | fs/fuse/file.c | 1 | ||||
| -rw-r--r-- | include/uapi/linux/fuse.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index a010585b0a74..c8071768b950 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
| @@ -2167,6 +2167,7 @@ unsigned fuse_file_poll(struct file *file, poll_table *wait) | |||
| 2167 | return DEFAULT_POLLMASK; | 2167 | return DEFAULT_POLLMASK; |
| 2168 | 2168 | ||
| 2169 | poll_wait(file, &ff->poll_wait, wait); | 2169 | poll_wait(file, &ff->poll_wait, wait); |
| 2170 | inarg.events = (__u32)poll_requested_events(wait); | ||
| 2170 | 2171 | ||
| 2171 | /* | 2172 | /* |
| 2172 | * Ask for notification iff there's someone waiting for it. | 2173 | * Ask for notification iff there's someone waiting for it. |
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 3451b6061e69..68619e9210b9 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | * | 63 | * |
| 64 | * 7.21 | 64 | * 7.21 |
| 65 | * - add FUSE_READDIRPLUS | 65 | * - add FUSE_READDIRPLUS |
| 66 | * - send the requested events in POLL request | ||
| 66 | */ | 67 | */ |
| 67 | 68 | ||
| 68 | #ifndef _LINUX_FUSE_H | 69 | #ifndef _LINUX_FUSE_H |
| @@ -585,7 +586,7 @@ struct fuse_poll_in { | |||
| 585 | __u64 fh; | 586 | __u64 fh; |
| 586 | __u64 kh; | 587 | __u64 kh; |
| 587 | __u32 flags; | 588 | __u32 flags; |
| 588 | __u32 padding; | 589 | __u32 events; |
| 589 | }; | 590 | }; |
| 590 | 591 | ||
| 591 | struct fuse_poll_out { | 592 | struct fuse_poll_out { |
