Skip to content

Commit 0db6c94

Browse files
committed
IoUring: fix and remove TODOs
backout from updating `pipe2` syscall to use Pipe2 flags Review if useful to implement - openat2*, f/madvice64 Signed-off-by: Bernard Assan <mega.alpha100@gmail.com>
1 parent 23e3753 commit 0db6c94

2 files changed

Lines changed: 9 additions & 70 deletions

File tree

lib/std/os/linux.zig

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,7 @@ pub fn pipe(fd: *[2]i32) usize {
13321332
}
13331333
}
13341334

1335-
pub fn pipe2(fd: *[2]i32, flags: Pipe2) usize {
1335+
pub fn pipe2(fd: *[2]i32, flags: O) usize {
13361336
return syscall2(.pipe2, @intFromPtr(fd), @as(u32, @bitCast(flags)));
13371337
}
13381338

@@ -3747,7 +3747,6 @@ pub const Futex2 = struct {
37473747
};
37483748

37493749
/// flags for `futex2_wait` syscall
3750-
// COMMIT: add mpol and fix private field as its 128 not 32
37513750
pub const Wait = packed struct(u32) {
37523751
size: Size,
37533752
numa: bool = false,
@@ -4467,7 +4466,6 @@ pub const Af = enum(u16) {
44674466
pub const MAX: u16 = @intFromEnum(Af.max);
44684467
};
44694468

4470-
// COMMIT: add new Typed So enum
44714469
/// SO_* type
44724470
pub const So = if (is_mips) enum(u16) {
44734471
debug = 1,
@@ -4759,7 +4757,6 @@ pub const So = if (is_mips) enum(u16) {
47594757
pub const detach_bpf: So = .detach_filter;
47604758
};
47614759

4762-
// COMMIT: add SO constants
47634760
/// Backwards-compatible SO_* constants
47644761
pub const SO = struct {
47654762
pub const DEBUG: u16 = @intFromEnum(So.debug);
@@ -5409,7 +5406,6 @@ pub const Msg = packed struct(u32) {
54095406
/// sendpage() internal: page may carry plain text and require encryption
54105407
sendpage_decrypted: bool = false,
54115408
_22: u4 = 0,
5412-
// COMMIT: new flags
54135409
/// Receive devmem skbs as cmsg
54145410
sock_devmem: bool = false,
54155411
/// Use user data in kernel path
@@ -6025,7 +6021,6 @@ pub const Epoll = if (is_mips) packed struct(u32) {
60256021
rdnorm: bool = false,
60266022
/// Priority data may be read
60276023
rdband: bool = false,
6028-
// COMMIT: new flags
60296024
/// Writing is now possible (normal data)
60306025
wrnorm: bool = false,
60316026
/// Priority data may be written
@@ -7008,7 +7003,6 @@ pub const utsname = extern struct {
70087003
};
70097004
pub const HOST_NAME_MAX = 64;
70107005

7011-
// COMMIT: RenameFlags
70127006
pub const Rename = packed struct(u32) {
70137007
/// Don't overwrite target
70147008
noreplace: bool = false,
@@ -7099,7 +7093,6 @@ pub const Statx = extern struct {
70997093

71007094
__pad2: [14]u64,
71017095

7102-
// COMMIT: add new StatxMask fields
71037096
// https://github.com/torvalds/linux/blob/755fa5b4fb36627796af19932a432d343220ec63/include/uapi/linux/stat.h#L203
71047097
/// matches STATX_* in kernel
71057098
pub const Mask = packed struct(u32) {
@@ -7157,7 +7150,6 @@ pub const Statx = extern struct {
71577150
};
71587151
};
71597152

7160-
// COMMIT: Statx as Packed Struct
71617153
// https://github.com/torvalds/linux/blob/755fa5b4fb36627796af19932a432d343220ec63/include/uapi/linux/stat.h#L248
71627154
/// matches STATX_ATTR_* in kernel
71637155
pub const Attr = packed struct(u64) {
@@ -8575,7 +8567,6 @@ pub const rlimit = extern struct {
85758567
/// DEPRECATED alias for Madvise
85768568
pub const MADV = Madvise;
85778569

8578-
// COMMIT: update MADV_* flags and type as enum
85798570
/// advice flags for `madvise`
85808571
/// matches MADV_* in kernel
85818572
pub const Madvise = enum(u32) {

0 commit comments

Comments
 (0)