From 45d6f8bef9f7c1fe73ec9cf9256f8fb3c0905b61 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2017 10:29:32 +0100 Subject: [PATCH] daemon: Use O_CLOEXEC instead of Unix.set_close_on_exec. In fact we already used O_CLOEXEC in daemon/inspect_fs_windows.c, meaning that the code wouldn't have compiled on OCaml 3.11. Thanks: Pino Toscano --- daemon/devsparts.ml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/daemon/devsparts.ml b/daemon/devsparts.ml index 9f9751b40..7395de923 100644 --- a/daemon/devsparts.ml +++ b/daemon/devsparts.ml @@ -49,8 +49,7 @@ let map_block_devices ~return_md f = List.filter ( fun dev -> try - let fd = openfile ("/dev/" ^ dev) [O_RDONLY] 0 in - Unix.set_close_on_exec fd; (* XXX *) + let fd = openfile ("/dev/" ^ dev) [O_RDONLY; O_CLOEXEC] 0 in close fd; true with _ -> false