2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00

util: Make set_proc_fd report success/error only

Returning the new proc fd value is useless.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2013-08-11 19:51:02 +04:00
parent 3e6f1ae82d
commit cdce5d216d
2 changed files with 6 additions and 7 deletions

View File

@ -1274,14 +1274,11 @@ static int fill_zombies_pids(struct pstree_item *item)
static int dump_zombies(void) static int dump_zombies(void)
{ {
struct pstree_item *item; struct pstree_item *item;
int oldfd, ret = -1; int ret = -1;
int pidns = current_ns_mask & CLONE_NEWPID; int pidns = current_ns_mask & CLONE_NEWPID;
if (pidns) { if (pidns && set_proc_fd(pidns_proc))
oldfd = set_proc_fd(pidns_proc);
if (oldfd < 0)
return -1; return -1;
}
for_each_pstree_item(item) { for_each_pstree_item(item) {
if (item->state != TASK_DEAD) if (item->state != TASK_DEAD)

4
util.c
View File

@ -179,7 +179,9 @@ void close_proc()
int set_proc_fd(int fd) int set_proc_fd(int fd)
{ {
return install_service_fd(PROC_FD_OFF, fd); if (install_service_fd(PROC_FD_OFF, fd) < 0)
return -1;
return 0;
} }
int set_proc_mountpoint(char *path) int set_proc_mountpoint(char *path)