packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysroot: Drop unnecessary `dup()` invocation 

It's close-on-exec, not close-on-fork.  I was clearly confused when
writing this; it works just fine to reference the fd in the child and
`fchdir()` before exec.  So drop the unnecessary duplication.

Just noticed this while reading the code for a random other reason.

Closes: #473
Approved by: giuseppe
This commit is contained in:
Colin Walters 2016-08-27 08:50:47 -04:00 committed by Atomic Bot
parent b6ec7526b5
commit cfc3934e81
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libostree/ostree-sysroot.c
View File

@ -1776,17 +1776,6 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self,
* threads, etc. * threads, etc.
*/ */
{ {
/* Make a copy of the fd that's *not* FD_CLOEXEC so that we pass
* it to the child.
*/
glnx_fd_close int child_deployment_dfd = dup (deployment_dfd);
if (child_deployment_dfd < 0)
{
glnx_set_error_from_errno (error);
goto out;
}
mount_child = fork (); mount_child = fork ();
if (mount_child < 0) if (mount_child < 0)
{ {
@ -1796,9 +1785,8 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self,
else if (mount_child == 0) else if (mount_child == 0)
{ {
/* Child process. Do NOT use any GLib API here. */ /* Child process. Do NOT use any GLib API here. */
if (fchdir (child_deployment_dfd) < 0) if (fchdir (deployment_dfd) < 0)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
(void) close (child_deployment_dfd);
if (mount ("overlay", "/usr", "overlay", 0, ovl_options) < 0) if (mount ("overlay", "/usr", "overlay", 0, ovl_options) < 0)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);