review: fix fanotify_event_metadata alignment on Rust <1.15.0

rust-lang · Apr 2, 2020 · 8b30245 · 8b30245
1 parent 4034008
commit 8b30245
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/unix/linux_like/linux/align.rs b/src/unix/linux_like/linux/align.rs
@@ -39,6 +39,17 @@ macro_rules! expand_align {
                 #[doc(hidden)]
                 size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
             }
+
+            #[repr(align(8))]
+            pub struct fanotify_event_metadata {
+                pub event_len: __u32,
+                pub vers: __u8,
+                pub reserved: __u8,
+                pub metadata_len: __u16,
+                pub mask: __u64,
+                pub fd: ::c_int,
+                pub pid: ::c_int,
+            }
         }
 
         s_no_extra_traits! {

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -477,17 +477,6 @@ s! {
         pub len: u32
     }
 
-    #[repr(align(8))]
-    pub struct fanotify_event_metadata {
-        pub event_len: __u32,
-        pub vers: __u8,
-        pub reserved: __u8,
-        pub metadata_len: __u16,
-        pub mask: __u64,
-        pub fd: ::c_int,
-        pub pid: ::c_int,
-    }
-
     pub struct fanotify_response {
         pub fd: ::c_int,
         pub response: __u32,

diff --git a/src/unix/linux_like/linux/no_align.rs b/src/unix/linux_like/linux/no_align.rs
@@ -35,6 +35,17 @@ macro_rules! expand_align {
                 __align: [::c_int; 0],
                 size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
             }
+
+            pub struct fanotify_event_metadata {
+                __align: [::c_long; 0],
+                pub event_len: __u32,
+                pub vers: __u8,
+                pub reserved: __u8,
+                pub metadata_len: __u16,
+                pub mask: __u64,
+                pub fd: ::c_int,
+                pub pid: ::c_int,
+            }
         }
 
         s_no_extra_traits! {