rst: Rename task_restore_core_args

Remove the _core_ from it.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-restore.c

@@ -1729,7 +1729,7 @@ static inline int itimer_restore_and_fix(char *n, ItimerEntry *ie,
 	return 0;
 }
 
-static int prepare_itimers(int pid, struct task_restore_core_args *args)
+static int prepare_itimers(int pid, struct task_restore_args *args)
 {
 	int fd, ret = -1;
 	ItimerEntry *ie;
@@ -1866,7 +1866,7 @@ static inline int verify_cap_size(CredsEntry *ce)
 		(ce->n_cap_prm == CR_CAP_SIZE) && (ce->n_cap_bnd == CR_CAP_SIZE));
 }
 
-static int prepare_creds(int pid, struct task_restore_core_args *args)
+static int prepare_creds(int pid, struct task_restore_args *args)
 {
 	int fd, ret;
 	CredsEntry *ce;
@@ -1921,7 +1921,7 @@ static int prepare_creds(int pid, struct task_restore_core_args *args)
 	return 0;
 }
 
-static int prepare_mm(pid_t pid, struct task_restore_core_args *args)
+static int prepare_mm(pid_t pid, struct task_restore_args *args)
 {
 	int fd, exe_fd, i, ret = -1;
 	MmEntry *mm;
@@ -2178,7 +2178,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
 
 	long restore_bootstrap_len;
 
-	struct task_restore_core_args *task_args;
+	struct task_restore_args *task_args;
 	struct thread_restore_args *thread_args;
 	long args_len;
 
@@ -2199,7 +2199,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
 
 	/* pr_info_vma_list(&self_vma_list); */
 
-	BUILD_BUG_ON(sizeof(struct task_restore_core_args) & 1);
+	BUILD_BUG_ON(sizeof(struct task_restore_args) & 1);
 	BUILD_BUG_ON(sizeof(struct thread_restore_args) & 1);
 	BUILD_BUG_ON(TASK_ENTRIES_SIZE % PAGE_SIZE);
 

include/restorer.h

@@ -83,7 +83,7 @@ struct thread_restore_args {
 
 	struct rst_sched_param		sp;
 
-	struct task_restore_core_args	*ta;
+	struct task_restore_args	*ta;
 
 	u32				tls;
 
@@ -91,7 +91,7 @@ struct thread_restore_args {
 	unsigned int			siginfo_nr;
 } __aligned(64);
 
-struct task_restore_core_args {
+struct task_restore_args {
 	struct thread_restore_args	*t;			/* thread group leader */
 
 	int				fd_exe_link;		/* opened self->exe file */

pie/restorer.c

@@ -196,7 +196,7 @@ static void restore_sched_info(struct rst_sched_param *p)
 	sys_sched_setscheduler(0, p->policy, &parm);
 }
 
-static void restore_rlims(struct task_restore_core_args *ta)
+static void restore_rlims(struct task_restore_args *ta)
 {
 	int r;
 
@@ -313,7 +313,7 @@ core_restore_end:
 	return -1;
 }
 
-static long restore_self_exe_late(struct task_restore_core_args *args)
+static long restore_self_exe_late(struct task_restore_args *args)
 {
 	int fd = args->fd_exe_link;
 
@@ -381,7 +381,7 @@ static void rst_tcp_repair_off(struct rst_tcp_sock *rts)
 		pr_perror("Failed to restore of SO_REUSEADDR on socket (%d)", ret);
 }
 
-static void rst_tcp_socks_all(struct task_restore_core_args *ta)
+static void rst_tcp_socks_all(struct task_restore_args *ta)
 {
 	int i;
 
@@ -465,7 +465,7 @@ static int vma_remap(unsigned long src, unsigned long dst, unsigned long len)
 	return 0;
 }
 
-static int create_posix_timers(struct task_restore_core_args *args)
+static int create_posix_timers(struct task_restore_args *args)
 {
 	int ret, i;
 	timer_t next_id;
@@ -502,7 +502,7 @@ static int create_posix_timers(struct task_restore_core_args *args)
 	return 0;
 }
 
-static void restore_posix_timers(struct task_restore_core_args *args)
+static void restore_posix_timers(struct task_restore_args *args)
 {
 	int i;
 	struct restore_posix_timer *rt;
@@ -577,7 +577,7 @@ static int unmap_old_vmas(void *premmapped_addr, unsigned long premmapped_len,
  * and jump execution to some predefined ip read from
  * core file.
  */
-long __export_restore_task(struct task_restore_core_args *args)
+long __export_restore_task(struct task_restore_args *args)
 {
 	long ret = -1;
 	int i;