Use Eio_unix.Private.chmod in eio_linux

Author: patricoferris

lib_eio_linux/eio_stubs.c

@@ -115,20 +115,6 @@ CAMLprim value caml_eio_symlinkat(value v_old_path, value v_new_fd, value v_new_
   CAMLreturn(Val_unit);
 }
 
-CAMLprim value caml_eio_fchmodat(value v_fd, value v_path, value v_mode, value v_flags) {
-  CAMLparam1(v_path);
-  char *path;
-  int ret;
-  caml_unix_check_path(v_path, "fchmodat");
-  path = caml_stat_strdup(String_val(v_path));
-  caml_enter_blocking_section();
-  ret = fchmodat(Int_val(v_fd), path, Int_val(v_mode), Int_val(v_flags));
-  caml_leave_blocking_section();
-  caml_stat_free(path);
-  if (ret == -1) uerror("fchmodat", v_path);
-  CAMLreturn(Val_unit);
-}
-
 CAMLprim value caml_eio_getrandom(value v_ba, value v_off, value v_len) {
   CAMLparam1(v_ba);
   ssize_t ret;

lib_eio_linux/low_level.ml

@@ -360,8 +360,6 @@ external eio_renameat : Unix.file_descr -> string -> Unix.file_descr -> string -
 
 external eio_symlinkat : string -> Unix.file_descr -> string -> unit = "caml_eio_symlinkat"
 
-external eio_fchmodat : Unix.file_descr -> string -> int -> int -> unit = "caml_eio_fchmodat"
-
 external eio_getrandom : Cstruct.buffer -> int -> int -> int = "caml_eio_getrandom"
 
 external eio_getdents : Unix.file_descr -> string list = "caml_eio_getdents"
@@ -488,15 +486,6 @@ let symlink ~link_to dir path =
     eio_symlinkat link_to parent leaf
   with Unix.Unix_error (code, name, arg) -> raise @@ Err.wrap_fs code name arg
 
-
-let chmod ~follow ~mode dir path =
-  let module X = Uring.Statx in
-  with_parent_dir "chmodat" dir path @@ fun parent leaf ->
-  let flags = if follow then 0 else (* at_symlink_nofollow *) 0x100 in
-  try
-    eio_fchmodat parent leaf mode flags
-  with Unix.Unix_error (code, name, arg) -> raise @@ Err.wrap_fs code name arg
-
 let shutdown socket command =
   try
     Fd.use_exn "shutdown" socket @@ fun fd ->
@@ -535,6 +524,15 @@ let read_link fd path =
     Eio_unix.run_in_systhread ~label:"read_link" (fun () -> Eio_unix.Private.read_link (Some parent) leaf)
   with Unix.Unix_error (code, name, arg) -> raise @@ Err.wrap_fs code name arg
 
+let chmod ~follow ~mode dir path =
+  let module X = Uring.Statx in
+  let flags = if follow then X.Flags.empty_path else X.Flags.(empty_path + symlink_nofollow) in
+  let flags = (flags :> int) in
+  try
+    with_parent_dir_fd dir path @@ fun parent leaf ->
+    Eio_unix.run_in_systhread ~label:"chmod" (fun () -> Eio_unix.Private.chmod parent leaf ~mode ~flags)
+  with Unix.Unix_error (code, name, arg) -> raise @@ Err.wrap_fs code name arg
+
 (* https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml *)
 let getaddrinfo ~service node =
   let to_eio_sockaddr_t {Unix.ai_family; ai_addr; ai_socktype; ai_protocol; _ } =