From: Eric Paris <eparis@redhat.com>
Date: Thu, 28 Oct 2010 21:21:56 +0000 (-0400)
Subject: fanotify: use __aligned_u64 in fanotify userspace metadata
X-Git-Tag: v2.6.37-rc1~17^2~18
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=2868201965419b9011f3f07fd80e765181343cb1

fanotify: use __aligned_u64 in fanotify userspace metadata

Currently the userspace struct exposed by fanotify uses
__attribute__((packed)) to make sure that alignment works on multiarch
platforms.  Since this causes a severe performance penalty on some
platforms we are going to switch to using explicit alignment notation on
the 64bit values so we don't have to use 'packed'

Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index 2c89ce7b644..8a621c1a099 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -79,10 +79,10 @@
 struct fanotify_event_metadata {
 	__u32 event_len;
 	__u32 vers;
-	__u64 mask;
+	__aligned_u64 mask;
 	__s32 fd;
 	__s32 pid;
-} __attribute__ ((packed));
+};
 
 struct fanotify_response {
 	__s32 fd;