Auto merge of #3030 - carbotaniuman:inotify-flags, r=JohnTitor

Try readding all inotify flags

Adds back some inotify flags that were once too new, but it appears the inexorable process of time has made the tests pass now.
This commit is contained in:
bors
2022-12-11 01:22:50 +00:00
4 changed files with 12 additions and 6 deletions
+3
View File
@@ -807,7 +807,10 @@ IN_CREATE
IN_DELETE
IN_DELETE_SELF
IN_DONT_FOLLOW
IN_EXCL_UNLINK
IN_IGNORED
IN_MASK_CREATE
IN_MASK_ADD
IN_ISDIR
IN_MODIFY
IN_MOVE
+3
View File
@@ -909,7 +909,10 @@ IN_CREATE
IN_DELETE
IN_DELETE_SELF
IN_DONT_FOLLOW
IN_EXCL_UNLINK
IN_IGNORED
IN_MASK_CREATE
IN_MASK_ADD
IN_ISDIR
IN_MODIFY
IN_MOVE
+3 -3
View File
@@ -2615,10 +2615,10 @@ pub const IN_Q_OVERFLOW: u32 = 0x0000_4000;
pub const IN_IGNORED: u32 = 0x0000_8000;
pub const IN_ONLYDIR: u32 = 0x0100_0000;
pub const IN_DONT_FOLLOW: u32 = 0x0200_0000;
// pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
// pub const IN_MASK_CREATE: u32 = 0x1000_0000;
// pub const IN_MASK_ADD: u32 = 0x2000_0000;
pub const IN_MASK_CREATE: u32 = 0x1000_0000;
pub const IN_MASK_ADD: u32 = 0x2000_0000;
pub const IN_ISDIR: u32 = 0x4000_0000;
pub const IN_ONESHOT: u32 = 0x8000_0000;
+3 -3
View File
@@ -3061,7 +3061,7 @@ pub const IN_Q_OVERFLOW: u32 = 0x0000_4000;
pub const IN_IGNORED: u32 = 0x0000_8000;
pub const IN_ONLYDIR: u32 = 0x0100_0000;
pub const IN_DONT_FOLLOW: u32 = 0x0200_0000;
// pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
// linux/keyctl.h
pub const KEY_SPEC_THREAD_KEYRING: i32 = -1;
@@ -3107,8 +3107,8 @@ pub const KEYCTL_INSTANTIATE_IOV: u32 = 20;
pub const KEYCTL_INVALIDATE: u32 = 21;
pub const KEYCTL_GET_PERSISTENT: u32 = 22;
// pub const IN_MASK_CREATE: u32 = 0x1000_0000;
// pub const IN_MASK_ADD: u32 = 0x2000_0000;
pub const IN_MASK_CREATE: u32 = 0x1000_0000;
pub const IN_MASK_ADD: u32 = 0x2000_0000;
pub const IN_ISDIR: u32 = 0x4000_0000;
pub const IN_ONESHOT: u32 = 0x8000_0000;