Skip to content

Commit c53d897

Browse files
authored
Merge pull request #720 from talex5/fix-isatty
eio_linux: require Linux >= 5.15
2 parents 911ccc8 + f2ce0c2 commit c53d897

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

lib_eio_linux/eio_linux.ml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,9 @@ module Flow = struct
154154

155155
let close = Eio_unix.Fd.close
156156

157-
let is_tty t = Fd.use_exn "isatty" t Unix.isatty
158-
159157
let stat = Low_level.fstat
160158

161159
let single_read t buf =
162-
if is_tty t then (
163-
(* Work-around for https://github.com/axboe/liburing/issues/354
164-
(should be fixed in Linux 5.14) *)
165-
Low_level.await_readable t
166-
);
167160
Low_level.readv t [buf]
168161

169162
let pread t ~file_offset bufs =

lib_eio_linux/sched.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,9 @@ let with_sched ?(fallback=no_fallback) config fn =
536536
| exception Unix.Unix_error(EPERM, _, _) -> fallback (`Msg "io_uring is not available (permission denied)")
537537
| uring ->
538538
let probe = Uring.get_probe uring in
539-
if not (Uring.op_supported probe Uring.Op.shutdown) then (
539+
if not (Uring.op_supported probe Uring.Op.mkdirat) then (
540540
Uring.exit uring;
541-
fallback (`Msg "Linux >= 5.11 is required for io_uring support")
541+
fallback (`Msg "Linux >= 5.15 is required for io_uring support")
542542
) else (
543543
statx_works := Uring.op_supported probe Uring.Op.msg_ring;
544544
match

0 commit comments

Comments
 (0)