From d51129571d58718164e44791f599d397a7d48d6f Mon Sep 17 00:00:00 2001
From: Enke Chen <enkechen@yahoo.com>
Date: Mon, 4 Feb 2013 16:14:32 +0100
Subject: [PATCH] --- yaml --- r: 352904 b: refs/heads/master c:
 0415d291022543d83ee799e9ffee08d856bca6e8 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/fs/fuse/file.c            | 1 +
 trunk/include/uapi/linux/fuse.h | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe39d7881ac..fd1e14347195 100644
--- 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
index a010585b0a74..c8071768b950 100644
--- 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
index 3451b6061e69..68619e9210b9 100644
--- 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 {