Unverified Commit c89533f4 by Christian Brauner Committed by Stéphane Graber

criu: make explicit that we're ignoring rmdir() return value

Fixes: Coverity 1461726. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent e052e6d0
...@@ -1011,7 +1011,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_ ...@@ -1011,7 +1011,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
} }
if (mount(rootfs->path, rootfs->mount, NULL, MS_BIND, NULL) < 0) { if (mount(rootfs->path, rootfs->mount, NULL, MS_BIND, NULL) < 0) {
rmdir(rootfs->mount); (void)rmdir(rootfs->mount);
goto out_fini_handler; goto out_fini_handler;
} }
} }
...@@ -1046,7 +1046,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_ ...@@ -1046,7 +1046,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
/* exec_criu() returning is an error */ /* exec_criu() returning is an error */
exec_criu(cgroup_ops, c->lxc_conf, &os); exec_criu(cgroup_ops, c->lxc_conf, &os);
umount(rootfs->mount); umount(rootfs->mount);
rmdir(rootfs->mount); (void)rmdir(rootfs->mount);
goto out_fini_handler; goto out_fini_handler;
} else { } else {
char title[2048]; char title[2048];
...@@ -1323,7 +1323,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op ...@@ -1323,7 +1323,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op
fail: fail:
close(criuout[0]); close(criuout[0]);
close(criuout[1]); close(criuout[1]);
rmdir(opts->directory); (void)rmdir(opts->directory);
free(criu_version); free(criu_version);
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment