Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-25 02:58:54 +00:00
Code Issues Projects Releases Wiki Activity

autofs: rework pipe search logic a bit

Browse source 
No not return error from autofs_find_pipe_read_end, if pipe end wasn't found,
because read_fd remains negative.
There is another explicit check in the caller of this function for read_fd and
proper messages are printed in such a case.
Return -ENOENT in case of read end of the pipe doesn't exist to distinguish
with other error types (will be used later).

Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Stanislav Kinsburskiy 2016-05-05 19:48:06 +03:00 • committed by Pavel Emelyanov
parent 9f89937468
commit e853848b5b
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
criu/autofs.c
View file

@ -141,21 +141,23 @@ static int autofs_find_pipe_read_end(int pgrp, long ino, int *read_fd)
if (fstatat(dirfd(dir), de->d_name, &buf, 0) < 0) {
pr_perror("Failed to fstatat");
break;
goto out;
}
fd = atoi(de->d_name);
found = autofs_check_fd_stat(&buf, pgrp, fd, ino, &mode);
if (found < 0)
break;
goto out;
if (found && (mode == O_RDONLY)) {
*read_fd = fd;
ret = 0;
break;
}
}
ret = 0;
out:
closedir(dir);
close_pid_proc();
@ -177,7 +179,7 @@ static int autofs_find_read_fd(int pgrp, long pipe_ino)
pr_err("Master %d doesn't have a read end of the pipe with "
"inode %ld opened\n", pgrp, pipe_ino);
pr_err("Abandoned mount or control was delegated to child?\n");
return -1;
return -ENOENT;
}
/* Let's check, that read end is empty */