Skip to content

Commit 8b30245

Browse files
committed
review: fix fanotify_event_metadata alignment on Rust <1.15.0
1 parent 4034008 commit 8b30245

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

src/unix/linux_like/linux/align.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ macro_rules! expand_align {
3939
#[doc(hidden)]
4040
size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
4141
}
42+
43+
#[repr(align(8))]
44+
pub struct fanotify_event_metadata {
45+
pub event_len: __u32,
46+
pub vers: __u8,
47+
pub reserved: __u8,
48+
pub metadata_len: __u16,
49+
pub mask: __u64,
50+
pub fd: ::c_int,
51+
pub pid: ::c_int,
52+
}
4253
}
4354

4455
s_no_extra_traits! {

src/unix/linux_like/linux/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -477,17 +477,6 @@ s! {
477477
pub len: u32
478478
}
479479

480-
#[repr(align(8))]
481-
pub struct fanotify_event_metadata {
482-
pub event_len: __u32,
483-
pub vers: __u8,
484-
pub reserved: __u8,
485-
pub metadata_len: __u16,
486-
pub mask: __u64,
487-
pub fd: ::c_int,
488-
pub pid: ::c_int,
489-
}
490-
491480
pub struct fanotify_response {
492481
pub fd: ::c_int,
493482
pub response: __u32,

src/unix/linux_like/linux/no_align.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,17 @@ macro_rules! expand_align {
3535
__align: [::c_int; 0],
3636
size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
3737
}
38+
39+
pub struct fanotify_event_metadata {
40+
__align: [::c_long; 0],
41+
pub event_len: __u32,
42+
pub vers: __u8,
43+
pub reserved: __u8,
44+
pub metadata_len: __u16,
45+
pub mask: __u64,
46+
pub fd: ::c_int,
47+
pub pid: ::c_int,
48+
}
3849
}
3950

4051
s_no_extra_traits! {

0 commit comments

Comments
 (0)