Commit 15ac89db authored by Pavel Emelyanov's avatar Pavel Emelyanov

files: Compact the expecten/not-expected branches in recv_fd_from_peer

As a slight side effect even expected fle is checked for being
task_fle(), but that's OK.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Acked-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
parent 958dbacd
......@@ -895,7 +895,7 @@ int recv_fd_from_peer(struct fdinfo_list_entry *fle)
tsock = get_service_fd(TRANSPORT_FD_OFF);
while (1) {
do {
if (ioctl(tsock, FIONREAD, &count) < 0) {
pr_perror("Can't do ioctl on transport sock: pid=%d\n", fle->pid);
return -1;
......@@ -906,9 +906,6 @@ int recv_fd_from_peer(struct fdinfo_list_entry *fle)
if (ret)
return -1;
if (tmp == fle)
break;
pr_info("Further fle=%p, pid=%d\n", tmp, fle->pid);
if (!task_fle(current, tmp)) {
pr_err("Unexpected fle %p, pid=%d\n", tmp, current->pid->ns[0].virt);
......@@ -916,10 +913,7 @@ int recv_fd_from_peer(struct fdinfo_list_entry *fle)
}
if (plant_fd(tmp, fd))
return -1;
}
if (plant_fd(fle, fd))
return -1;
} while (tmp != fle);
return 0;
}
......
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