---

yaml --- r: 352904 b: refs/heads/master c: 0415d29 h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · d511295 · d511295
1 parent b8bb619
commit d511295
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfca7cebc2679f3d129f8e680a8f199a7ad16e38
+refs/heads/master: 0415d291022543d83ee799e9ffee08d856bca6e8
diff --git a/trunk/fs/fuse/file.c b/trunk/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/trunk/include/uapi/linux/fuse.h b/trunk/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 {