Commit 73633d55 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Cyrill Gorcunov

crtools: Kill constant arg from parasite_dump_pages_seized

The last one is always CR_FD_PAGES.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 0ca9ccc3
...@@ -1118,8 +1118,7 @@ static int dump_one_task(pid_t pid, struct cr_fdset *cr_fdset) ...@@ -1118,8 +1118,7 @@ static int dump_one_task(pid_t pid, struct cr_fdset *cr_fdset)
goto err; goto err;
} }
ret = parasite_dump_pages_seized(parasite_ctl, &vma_area_list, ret = parasite_dump_pages_seized(parasite_ctl, &vma_area_list, cr_fdset);
cr_fdset, CR_FD_PAGES);
if (ret) { if (ret) {
pr_err("Can't dump pages (pid: %d) with parasite\n", pid); pr_err("Can't dump pages (pid: %d) with parasite\n", pid);
goto err; goto err;
......
...@@ -37,7 +37,7 @@ extern int syscall_seized(pid_t pid, ...@@ -37,7 +37,7 @@ extern int syscall_seized(pid_t pid,
user_regs_struct_t *result); user_regs_struct_t *result);
extern int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_area_list, extern int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_area_list,
struct cr_fdset *cr_fdset, int fd_type); struct cr_fdset *cr_fdset);
extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset); extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
extern struct parasite_ctl *parasite_infect_seized(pid_t pid, void *addr_hint, struct list_head *vma_area_list); extern struct parasite_ctl *parasite_infect_seized(pid_t pid, void *addr_hint, struct list_head *vma_area_list);
......
...@@ -388,7 +388,7 @@ out: ...@@ -388,7 +388,7 @@ out:
* process) and tells it to dump pages into the file. * process) and tells it to dump pages into the file.
*/ */
int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_area_list, int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_area_list,
struct cr_fdset *cr_fdset, int fd_type) struct cr_fdset *cr_fdset)
{ {
parasite_args_cmd_dumppages_t parasite_dumppages = { }; parasite_args_cmd_dumppages_t parasite_dumppages = { };
parasite_args_t parasite_arg = { }; parasite_args_t parasite_arg = { };
...@@ -400,11 +400,11 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a ...@@ -400,11 +400,11 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
int status, path_len, ret = -1; int status, path_len, ret = -1;
pr_info("\n"); pr_info("\n");
pr_info("Dumping pages (type: %d pid: %d)\n", fd_type, ctl->pid); pr_info("Dumping pages (type: %d pid: %d)\n", CR_FD_PAGES, ctl->pid);
pr_info("----------------------------------------\n"); pr_info("----------------------------------------\n");
path_len = strlen(cr_fdset->desc[fd_type].path); path_len = strlen(cr_fdset->desc[CR_FD_PAGES].path);
pr_info("Dumping pages %s\n", cr_fdset->desc[fd_type].path); pr_info("Dumping pages %s\n", cr_fdset->desc[CR_FD_PAGES].path);
if (path_len > sizeof(parasite_dumppages.open_path)) { if (path_len > sizeof(parasite_dumppages.open_path)) {
pr_panic("Dumping pages path is too long (%d while %d allowed)\n", pr_panic("Dumping pages path is too long (%d while %d allowed)\n",
...@@ -412,7 +412,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a ...@@ -412,7 +412,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
goto out; goto out;
} }
if (fchmod(cr_fdset->desc[fd_type].fd, CR_FD_PERM_DUMP)) { if (fchmod(cr_fdset->desc[CR_FD_PAGES].fd, CR_FD_PERM_DUMP)) {
pr_perror("Can't change permissions on pages file\n"); pr_perror("Can't change permissions on pages file\n");
goto out; goto out;
} }
...@@ -421,10 +421,10 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a ...@@ -421,10 +421,10 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
* Make sure the data is on disk since we will re-open * Make sure the data is on disk since we will re-open
* it in another process. * it in another process.
*/ */
fsync(cr_fdset->desc[fd_type].fd); fsync(cr_fdset->desc[CR_FD_PAGES].fd);
strncpy(parasite_dumppages.open_path, strncpy(parasite_dumppages.open_path,
cr_fdset->desc[fd_type].path, cr_fdset->desc[CR_FD_PAGES].path,
sizeof(parasite_dumppages.open_path)); sizeof(parasite_dumppages.open_path));
parasite_dumppages.open_flags = O_WRONLY; parasite_dumppages.open_flags = O_WRONLY;
...@@ -493,7 +493,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a ...@@ -493,7 +493,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, struct list_head *vma_a
pr_info("Summary: %16li pages dumped\n", nrpages_dumped); pr_info("Summary: %16li pages dumped\n", nrpages_dumped);
err_restore: err_restore:
jerr(fchmod(cr_fdset->desc[fd_type].fd, CR_FD_PERM), out); jerr(fchmod(cr_fdset->desc[CR_FD_PAGES].fd, CR_FD_PERM), out);
out: out:
pr_info("----------------------------------------\n"); pr_info("----------------------------------------\n");
......
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