]> git.proxmox.com Git - mirror_lxc.git/commitdiff
start: fix mainloop cleanup goto statements
authorChristian Brauner <christian.brauner@ubuntu.com>
Sun, 21 Jan 2018 12:55:42 +0000 (13:55 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Sun, 21 Jan 2018 12:55:42 +0000 (13:55 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/start.c

index 41442a162d14f4dec4c6412167b54fd156c79bff..40c5d2d2f809e79fb2b2a08d6a75f49ae091b923 100644 (file)
@@ -545,22 +545,21 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
        close(descr.epfd);
        descr.epfd = -EBADF;
        if (ret < 0 || !handler->init_died)
-               goto out_mainloop;
+               goto out_mainloop_console;
 
        if (has_console)
                ret = lxc_mainloop(&descr_console, 0);
 
-
-out_mainloop:
-       lxc_mainloop_close(&descr);
-       TRACE("Closed mainloop");
-
 out_mainloop_console:
        if (has_console) {
                lxc_mainloop_close(&descr_console);
                TRACE("Closed console mainloop");
        }
 
+out_mainloop:
+       lxc_mainloop_close(&descr);
+       TRACE("Closed mainloop");
+
 out_sigfd:
        close(handler->sigfd);
        TRACE("Closed signal file descriptor %d", handler->sigfd);