From efbf59ddf69085571f7f144f9e80898098596b2b Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 6 Jul 2017 12:40:23 +0300 Subject: [PATCH] page-xfer: Use send_psi everywhere There are two places left that send ps_iov by hands into socket. Switch it to use common helper. Acked-by: Mike Rapoport Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- criu/page-xfer.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/criu/page-xfer.c b/criu/page-xfer.c index 32012cc1a..5d4bf1128 100644 --- a/criu/page-xfer.c +++ b/criu/page-xfer.c @@ -538,10 +538,8 @@ static int check_parent_server_xfer(int fd_type, long id) pi.cmd = PS_IOV_PARENT; pi.dst_id = encode_pm(fd_type, id); - if (write(page_server_sk, &pi, sizeof(pi)) != sizeof(pi)) { - pr_perror("Can't write to page server"); + if (send_psi(page_server_sk, &pi)) return -1; - } tcp_nodelay(page_server_sk, true); @@ -1046,10 +1044,8 @@ int disconnect_from_page_server(void) else pi.cmd = PS_IOV_FLUSH; - if (write(page_server_sk, &pi, sizeof(pi)) != sizeof(pi)) { - pr_perror("Can't write the fini command to server"); + if (send_psi(page_server_sk, &pi)) goto out; - } if (read(page_server_sk, &status, sizeof(status)) != sizeof(status)) { pr_perror("The page server doesn't answer");