fuse: send poll events

commit 626cf23660 "poll: add poll_requested_events()..." enabled us to send the
requested events to the filesystem.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a010585b0a74efab8273bf6771f26394704083e4..c8071768b9503455f592ff9aac80b71e3a922688 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2167,6 +2167,7 @@ unsigned 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);
 
        /*
         * 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 3451b6061e694f327a15d3f8f273109e3fe74631..68619e9210b9308148bc788600940fcfd9f60a83 100644 (file)
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -63,6 +63,7 @@
  *
  * 7.21
  *  - add FUSE_READDIRPLUS
+ *  - send the requested events in POLL request
  */
 
 #ifndef _LINUX_FUSE_H
@@ -585,7 +586,7 @@ struct fuse_poll_in {
        __u64   fh;
        __u64   kh;
        __u32   flags;
-       __u32   padding;
+       __u32   events;
 };
 
 struct fuse_poll_out {