From c52481f6214ede28b323a45f3e78d2d8185ef0bd Mon Sep 17 00:00:00 2001
From: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Date: Fri, 20 Aug 2010 10:02:15 +0100
Subject: [PATCH] --- yaml --- r: 210099 b: refs/heads/master c:
 0fb85621df4f9f7c663c6c77c302e821a832c95e h: refs/heads/master i:   210097:
 4a9116d7447790af248869ae8f2033d8d794e3ee   210095:
 7fe8523da9242b9f6aafb846599f7086daa4293d v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/fanotify.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c4067f485c72..0054e427f1f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff8d6e983185ce19fa92bb836eb52b589957be65
+refs/heads/master: 0fb85621df4f9f7c663c6c77c302e821a832c95e
diff --git a/trunk/include/linux/fanotify.h b/trunk/include/linux/fanotify.h
index 985435622ecd..63531a6b4d2a 100644
--- a/trunk/include/linux/fanotify.h
+++ b/trunk/include/linux/fanotify.h
@@ -65,14 +65,14 @@
 				 FAN_ALL_PERM_EVENTS |\
 				 FAN_Q_OVERFLOW)
 
-#define FANOTIFY_METADATA_VERSION	1
+#define FANOTIFY_METADATA_VERSION	2
 
 struct fanotify_event_metadata {
 	__u32 event_len;
 	__u32 vers;
-	__s32 fd;
 	__u64 mask;
-	__s64 pid;
+	__s32 fd;
+	__s32 pid;
 } __attribute__ ((packed));
 
 struct fanotify_response {