Skip to content

C
criu
Commit 987de2de authored by Pavel Emelyanov's avatar Pavel Emelyanov
Browse files
Options

parasite: Rename ack-waiting function to look better 

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent f2978d2a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
include/parasite-syscall.h
View file @ 987de2de
...@@ -71,7 +71,7 @@ extern int parasite_send_fd(struct parasite_ctl *ctl, int fd); ...@@ -71,7 +71,7 @@ extern int parasite_send_fd(struct parasite_ctl *ctl, int fd);
extern int parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl); extern int parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl);
extern int __parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl); extern int __parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl);
extern int __parasite_execute_daemon_wait_ack(unsigned int cmd, extern int __parasite_wait_daemon_ack(unsigned int cmd,
struct parasite_ctl *ctl); struct parasite_ctl *ctl);
extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc); extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
......
mem.c
View file @ 987de2de
...@@ -377,7 +377,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl, ...@@ -377,7 +377,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
if (ret) if (ret)
goto out_pp; goto out_pp;
ret = __parasite_execute_daemon_wait_ack(PARASITE_CMD_DUMPPAGES, ctl); ret = __parasite_wait_daemon_ack(PARASITE_CMD_DUMPPAGES, ctl);
if (ret < 0) if (ret < 0)
goto out_pp; goto out_pp;
......
parasite-syscall.c
View file @ 987de2de
...@@ -271,7 +271,7 @@ static int parasite_wait_ack(int sockfd, unsigned int cmd, struct ctl_msg *m) ...@@ -271,7 +271,7 @@ static int parasite_wait_ack(int sockfd, unsigned int cmd, struct ctl_msg *m)
return -1; return -1;
} }
int __parasite_execute_daemon_wait_ack(unsigned int cmd, int __parasite_wait_daemon_ack(unsigned int cmd,
struct parasite_ctl *ctl) struct parasite_ctl *ctl)
{ {
struct ctl_msg m; struct ctl_msg m;
...@@ -302,7 +302,7 @@ int parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl) ...@@ -302,7 +302,7 @@ int parasite_execute_daemon(unsigned int cmd, struct parasite_ctl *ctl)
ret = __parasite_execute_daemon(cmd, ctl); ret = __parasite_execute_daemon(cmd, ctl);
if (!ret) if (!ret)
ret = __parasite_execute_daemon_wait_ack(cmd, ctl); ret = __parasite_wait_daemon_ack(cmd, ctl);
return ret; return ret;
} }
...@@ -676,7 +676,7 @@ int parasite_drain_fds_seized(struct parasite_ctl *ctl, ...@@ -676,7 +676,7 @@ int parasite_drain_fds_seized(struct parasite_ctl *ctl,
if (ret) if (ret)
pr_err("Can't retrieve FDs from socket\n"); pr_err("Can't retrieve FDs from socket\n");
ret |= __parasite_execute_daemon_wait_ack(PARASITE_CMD_DRAIN_FDS, ctl); ret |= __parasite_wait_daemon_ack(PARASITE_CMD_DRAIN_FDS, ctl);
err: err:
return ret; return ret;
} }
...@@ -694,7 +694,7 @@ int parasite_get_proc_fd_seized(struct parasite_ctl *ctl) ...@@ -694,7 +694,7 @@ int parasite_get_proc_fd_seized(struct parasite_ctl *ctl)
fd = recv_fd(ctl->tsock); fd = recv_fd(ctl->tsock);
if (fd < 0) if (fd < 0)
pr_err("Can't retrieve FD from socket\n"); pr_err("Can't retrieve FD from socket\n");
if (__parasite_execute_daemon_wait_ack(PARASITE_CMD_GET_PROC_FD, ctl)) { if (__parasite_wait_daemon_ack(PARASITE_CMD_GET_PROC_FD, ctl)) {
close(fd); close(fd);
return -1; return -1;
} }
......
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