mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

vdso: drop excessive parameter who from vdso_proxify

Browse Source 
It's always "dumpee" and is used in two pr_err() messages,
put it right there.

Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov
2017-02-16 19:20:42 +03:00
committed by Andrei Vagin
parent 2c34d08055
commit 2261748e41
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
criu/include/parasite-vdso.h
View File

@@ -81,7 +81,7 @@ static inline bool is_vdso_mark(void *addr)
extern int vdso_do_park(struct vdso_symtable *sym_rt, unsigned long park_at, unsigned long park_size); extern int vdso_do_park(struct vdso_symtable *sym_rt, unsigned long park_at, unsigned long park_size);
extern int vdso_map_compat(unsigned long map_at); extern int vdso_map_compat(unsigned long map_at);
extern int vdso_proxify(char *who, struct vdso_symtable *sym_rt, extern int vdso_proxify(struct vdso_symtable *sym_rt,
unsigned long vdso_rt_parked_at, size_t index, unsigned long vdso_rt_parked_at, size_t index,
VmaEntry *vmas, size_t nr_vmas, bool compat_vdso); VmaEntry *vmas, size_t nr_vmas, bool compat_vdso);

6
criu/pie/parasite-vdso.c
View File

@@ -103,7 +103,7 @@ int __vdso_fill_symtable(uintptr_t mem, size_t size,
} }
#endif #endif
int vdso_proxify(char *who, struct vdso_symtable *sym_rt, int vdso_proxify(struct vdso_symtable *sym_rt,
unsigned long vdso_rt_parked_at, size_t index, unsigned long vdso_rt_parked_at, size_t index,
VmaEntry *vmas, size_t nr_vmas, bool compat_vdso) VmaEntry *vmas, size_t nr_vmas, bool compat_vdso)
{ {
@@ -197,14 +197,14 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
if (sys_munmap((void *)(uintptr_t)vma_vdso->start, if (sys_munmap((void *)(uintptr_t)vma_vdso->start,
vma_entry_len(vma_vdso))) { vma_entry_len(vma_vdso))) {
pr_err("Failed to unmap %s\n", who); pr_err("Failed to unmap dumpee\n");
return -1; return -1;
} }
if (vma_vvar) { if (vma_vvar) {
if (sys_munmap((void *)(uintptr_t)vma_vvar->start, if (sys_munmap((void *)(uintptr_t)vma_vvar->start,
vma_entry_len(vma_vvar))) { vma_entry_len(vma_vvar))) {
pr_err("Failed to unmap %s\n", who); pr_err("Failed to unmap dumpee\n");
return -1; return -1;
} }

2
criu/pie/restorer.c
View File

@@ -1188,7 +1188,7 @@ long __export_restore_task(struct task_restore_args *args)
for (i = 0; i < args->vmas_n; i++) { for (i = 0; i < args->vmas_n; i++) {
if (vma_entry_is(&args->vmas[i], VMA_AREA_VDSO) || if (vma_entry_is(&args->vmas[i], VMA_AREA_VDSO) ||
vma_entry_is(&args->vmas[i], VMA_AREA_VVAR)) { vma_entry_is(&args->vmas[i], VMA_AREA_VVAR)) {
if (vdso_proxify("dumpee", &args->vdso_sym_rt, if (vdso_proxify(&args->vdso_sym_rt,
args->vdso_rt_parked_at, args->vdso_rt_parked_at,
i, args->vmas, args->vmas_n, i, args->vmas, args->vmas_n,
args->compatible_mode)) args->compatible_mode))