Skip to content

Commit 8ccb828

Browse files
committed
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.
2 parents 2cc0b3b + ec6d846 commit 8ccb828

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

libc-test/semver/android.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,10 @@ IN_CREATE
807807
IN_DELETE
808808
IN_DELETE_SELF
809809
IN_DONT_FOLLOW
810+
IN_EXCL_UNLINK
810811
IN_IGNORED
812+
IN_MASK_CREATE
813+
IN_MASK_ADD
811814
IN_ISDIR
812815
IN_MODIFY
813816
IN_MOVE

libc-test/semver/linux.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,10 @@ IN_CREATE
909909
IN_DELETE
910910
IN_DELETE_SELF
911911
IN_DONT_FOLLOW
912+
IN_EXCL_UNLINK
912913
IN_IGNORED
914+
IN_MASK_CREATE
915+
IN_MASK_ADD
913916
IN_ISDIR
914917
IN_MODIFY
915918
IN_MOVE

src/unix/linux_like/android/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,10 +2615,10 @@ pub const IN_Q_OVERFLOW: u32 = 0x0000_4000;
26152615
pub const IN_IGNORED: u32 = 0x0000_8000;
26162616
pub const IN_ONLYDIR: u32 = 0x0100_0000;
26172617
pub const IN_DONT_FOLLOW: u32 = 0x0200_0000;
2618-
// pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
2618+
pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
26192619

2620-
// pub const IN_MASK_CREATE: u32 = 0x1000_0000;
2621-
// pub const IN_MASK_ADD: u32 = 0x2000_0000;
2620+
pub const IN_MASK_CREATE: u32 = 0x1000_0000;
2621+
pub const IN_MASK_ADD: u32 = 0x2000_0000;
26222622
pub const IN_ISDIR: u32 = 0x4000_0000;
26232623
pub const IN_ONESHOT: u32 = 0x8000_0000;
26242624

src/unix/linux_like/linux/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3061,7 +3061,7 @@ pub const IN_Q_OVERFLOW: u32 = 0x0000_4000;
30613061
pub const IN_IGNORED: u32 = 0x0000_8000;
30623062
pub const IN_ONLYDIR: u32 = 0x0100_0000;
30633063
pub const IN_DONT_FOLLOW: u32 = 0x0200_0000;
3064-
// pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
3064+
pub const IN_EXCL_UNLINK: u32 = 0x0400_0000;
30653065

30663066
// linux/keyctl.h
30673067
pub const KEY_SPEC_THREAD_KEYRING: i32 = -1;
@@ -3107,8 +3107,8 @@ pub const KEYCTL_INSTANTIATE_IOV: u32 = 20;
31073107
pub const KEYCTL_INVALIDATE: u32 = 21;
31083108
pub const KEYCTL_GET_PERSISTENT: u32 = 22;
31093109

3110-
// pub const IN_MASK_CREATE: u32 = 0x1000_0000;
3111-
// pub const IN_MASK_ADD: u32 = 0x2000_0000;
3110+
pub const IN_MASK_CREATE: u32 = 0x1000_0000;
3111+
pub const IN_MASK_ADD: u32 = 0x2000_0000;
31123112
pub const IN_ISDIR: u32 = 0x4000_0000;
31133113
pub const IN_ONESHOT: u32 = 0x8000_0000;
31143114

0 commit comments

Comments
 (0)