Make Eio_unix.Private.chown require a file descriptor

Author: patricoferris

lib_eio/unix/eio_unix.mli

@@ -108,8 +108,8 @@ module Private : sig
   val read_link : Fd.t option -> string -> string
   val read_link_unix : Unix.file_descr option -> string -> string
 
-  val chown : flags:int -> uid:int64 -> gid:int64 -> Fd.t option -> string -> unit
-  val chown_unix : flags:int -> uid:int64 -> gid:int64 -> Unix.file_descr option -> string -> unit
+  val chown : flags:int -> uid:int64 -> gid:int64 -> Fd.t -> string -> unit
+  val chown_unix : flags:int -> uid:int64 -> gid:int64 -> Unix.file_descr -> string -> unit
 end
 
 module Pi = Pi

lib_eio/unix/private.ml

@@ -37,9 +37,7 @@ let read_link fd path = Fd.use_exn_opt "readlink" fd (fun fd -> read_link_unix f
 external eio_fchownat : Unix.file_descr -> string -> int64 -> int64 -> int -> unit = "eio_unix_fchownat"
 
 let chown_unix ~flags ~uid ~gid fd path =
-  match fd with
-  | None -> Unix.chown path (Int64.to_int uid) (Int64.to_int gid)
-  | Some fd -> eio_fchownat fd path uid gid flags
+  eio_fchownat fd path uid gid flags
 
 let chown ~flags ~uid ~gid fd path =
-  Fd.use_exn_opt "chown" fd (fun fd -> chown_unix ~uid ~gid ~flags fd path)
+  Fd.use_exn "chown" fd (fun fd -> chown_unix ~uid ~gid ~flags fd path)

lib_eio_linux/low_level.ml

@@ -530,7 +530,7 @@ let chown ~follow ~uid ~gid fd path =
   let flags = (follow :> int) in
   try
     with_parent_dir_fd fd path @@ fun parent leaf ->
-    Eio_unix.run_in_systhread ~label:"chown" (fun () -> Eio_unix.Private.chown ~flags ~uid ~gid (Some parent) leaf)
+    Eio_unix.run_in_systhread ~label:"chown" (fun () -> Eio_unix.Private.chown ~flags ~uid ~gid parent leaf)
   with Unix.Unix_error (code, name, arg) -> raise @@ Err.wrap_fs code name arg
 
 (* https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml *)

lib_eio_posix/low_level.ml

@@ -433,7 +433,7 @@ let chown ~follow ~uid ~gid dirfd path =
   in_worker_thread "chown" @@ fun () ->
   Resolve.with_parent "chown" dirfd path @@ fun dirfd path ->
   let dirfd = Option.value dirfd ~default:at_fdcwd in
-  Eio_unix.Private.chown_unix ~flags ~uid ~gid (Some dirfd) path
+  Eio_unix.Private.chown_unix ~flags ~uid ~gid dirfd path
 
 type stat
 external create_stat : unit -> stat = "caml_eio_posix_make_stat"