mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-18 00:58:31 +00:00
Fix typos in log messages
Someone has to do it, right?.. Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin
Pavel Emelyanov
parent
4eb723db98
commit
d90d4b1b88
16 changed files with 31 additions and 31 deletions
10
cr-dump.c
10
cr-dump.c
|
|
@ -430,7 +430,7 @@ static int get_task_auxv(pid_t pid, MmEntry *mm, size_t *size)
|
|||
{
|
||||
int fd, ret, i;
|
||||
|
||||
pr_info("Obtainting task auvx ... ");
|
||||
pr_info("Obtaining task auvx ... ");
|
||||
|
||||
fd = open_proc(pid, "auxv");
|
||||
if (fd < 0)
|
||||
|
|
@ -443,7 +443,7 @@ static int get_task_auxv(pid_t pid, MmEntry *mm, size_t *size)
|
|||
break;
|
||||
else if (ret != sizeof(auxv_t)) {
|
||||
ret = -1;
|
||||
pr_perror("Error readind %d's auxv[%d]",
|
||||
pr_perror("Error reading %d's auxv[%d]",
|
||||
pid, i);
|
||||
goto err;
|
||||
}
|
||||
|
|
@ -518,7 +518,7 @@ static int get_task_personality(pid_t pid, u32 *personality)
|
|||
FILE *file = NULL;
|
||||
int ret = -1;
|
||||
|
||||
pr_info("Obtainting personality ... ");
|
||||
pr_info("Obtaining personality ... ");
|
||||
|
||||
file = fopen_proc(pid, "personality");
|
||||
if (!file)
|
||||
|
|
@ -1338,7 +1338,7 @@ static int dump_zombies(void)
|
|||
goto err;
|
||||
}
|
||||
|
||||
pr_info("Obtainting zombie stat ... ");
|
||||
pr_info("Obtaining zombie stat ... ");
|
||||
if (parse_pid_stat(item->pid.virt, &pps_buf) < 0)
|
||||
goto err;
|
||||
|
||||
|
|
@ -1384,7 +1384,7 @@ static int dump_one_task(struct pstree_item *item)
|
|||
if (!dfds)
|
||||
goto err_free;
|
||||
|
||||
pr_info("Obtainting task stat ... ");
|
||||
pr_info("Obtaining task stat ... ");
|
||||
ret = parse_pid_stat(pid, &pps_buf);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ int cr_exec(int pid, char **opt)
|
|||
|
||||
ret = execute_syscall(ctl, si, opt + 1);
|
||||
if (ret < 0)
|
||||
pr_err("Can't execure syscall remotely\n");
|
||||
pr_err("Can't execute syscall remotely\n");
|
||||
|
||||
parasite_cure_seized(ctl, NULL);
|
||||
out_unseize:
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ static int prepare_sigactions(int pid)
|
|||
ret = -1;
|
||||
break;
|
||||
}
|
||||
pr_warn("This format of sigacts-%d.img is depricated\n", pid);
|
||||
pr_warn("This format of sigacts-%d.img is deprecated\n", pid);
|
||||
break;
|
||||
}
|
||||
if (ret < 0)
|
||||
|
|
@ -1272,7 +1272,7 @@ out:
|
|||
return 1;
|
||||
}
|
||||
|
||||
pr_info("Restore finised successfully. Resuming tasks.\n");
|
||||
pr_info("Restore finished successfully. Resuming tasks.\n");
|
||||
futex_set_and_wake(&task_entries->start, CR_STATE_COMPLETE);
|
||||
|
||||
if (!opts->restore_detach)
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ int main(int argc, char *argv[])
|
|||
n->outside = strchr(optarg, '=');
|
||||
if (n->outside == NULL) {
|
||||
xfree(n);
|
||||
pr_err("Invalid agument for --veth-pair\n");
|
||||
pr_err("Invalid argument for --veth-pair\n");
|
||||
goto usage;
|
||||
}
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
ret = open_image_dir();
|
||||
if (ret < 0) {
|
||||
pr_perror("can't open currect directory");
|
||||
pr_perror("can't open current directory");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
10
file-lock.c
10
file-lock.c
|
|
@ -53,7 +53,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag,
|
|||
} else if (!strcmp(fl_flag, "FLOCK")) {
|
||||
fle->flag |= FL_FLOCK;
|
||||
} else {
|
||||
pr_err("Unknow file lock!\n");
|
||||
pr_err("Unknown file lock!\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag,
|
|||
} else if (!strcmp(fl_option, "WRITE")) {
|
||||
fle->type |= LOCK_WRITE;
|
||||
} else {
|
||||
pr_err("Unknow lock option!\n");
|
||||
pr_err("Unknown lock option!\n");
|
||||
goto err;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -78,7 +78,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag,
|
|||
} else if (!strcmp(fl_option, "READ")) {
|
||||
fle->type |= F_RDLCK;
|
||||
} else {
|
||||
pr_err("Unknow lock option!\n");
|
||||
pr_err("Unknown lock option!\n");
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
|
@ -175,7 +175,7 @@ static int restore_file_lock(FileLockEntry *fle)
|
|||
} else if (fle->type == F_UNLCK) {
|
||||
cmd = LOCK_UN;
|
||||
} else {
|
||||
pr_err("Unknow flock type!\n");
|
||||
pr_err("Unknown flock type!\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ static int restore_file_lock(FileLockEntry *fle)
|
|||
goto err;
|
||||
}
|
||||
} else {
|
||||
pr_err("Unknow file lock style!\n");
|
||||
pr_err("Unknown file lock style!\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
|
|
|||
2
files.c
2
files.c
|
|
@ -776,7 +776,7 @@ int prepare_fds(struct pstree_item *me)
|
|||
futex_wait_while_lt(&fdt->fdt_lock, fdt->nr);
|
||||
|
||||
if (fdt->pid != me->pid.virt) {
|
||||
pr_info("File descriptor talbe is shared with %d\n", fdt->pid);
|
||||
pr_info("File descriptor table is shared with %d\n", fdt->pid);
|
||||
futex_wait_until(&fdt->fdt_lock, fdt->nr + 1);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ static int restore_one_inotify(int inotify_fd, struct fsnotify_mark_info *info)
|
|||
ret = 0;
|
||||
break;
|
||||
} else if (wd > iwe->wd) {
|
||||
pr_err("Usorted watch found for %d with %d\n", inotify_fd, iwe->wd);
|
||||
pr_err("Unsorted watch found for %d with %d\n", inotify_fd, iwe->wd);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
2
mount.c
2
mount.c
|
|
@ -606,7 +606,7 @@ static int cr_pivot_root()
|
|||
return -1;
|
||||
}
|
||||
if (mkdtemp(put_root) == NULL) {
|
||||
pr_perror("Can't create a temparary directory");
|
||||
pr_perror("Can't create a temporary directory");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
2
net.c
2
net.c
|
|
@ -146,7 +146,7 @@ static int dump_links(struct cr_fdset *fds)
|
|||
|
||||
static int restore_link_cb(struct nlmsghdr *hdr, void *arg)
|
||||
{
|
||||
pr_info("Got responce on SETLINK =)\n");
|
||||
pr_info("Got response on SETLINK =)\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ static int read_page(struct page_read *pr, unsigned long vaddr, void *buf)
|
|||
|
||||
ret = read(pr->fd_pg, buf, PAGE_SIZE);
|
||||
if (ret != PAGE_SIZE) {
|
||||
pr_err("Can'r read mapping page %d\n", ret);
|
||||
pr_err("Can't read mapping page %d\n", ret);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu
|
|||
vaddr, pr->cvaddr, lseek(pr->fd_pg, 0, SEEK_CUR));
|
||||
ret = read(pr->fd_pg, buf, PAGE_SIZE);
|
||||
if (ret != PAGE_SIZE) {
|
||||
pr_err("Can'r read mapping page %d\n", ret);
|
||||
pr_err("Can't read mapping page %d\n", ret);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
6
ptrace.c
6
ptrace.c
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
int unseize_task(pid_t pid, int st)
|
||||
{
|
||||
pr_debug("\tUnseizeing %d into %d\n", pid, st);
|
||||
pr_debug("\tUnseizing %d into %d\n", pid, st);
|
||||
|
||||
if (st == TASK_DEAD)
|
||||
kill(pid, SIGKILL);
|
||||
|
|
@ -73,9 +73,9 @@ int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid)
|
|||
if (ret < 0) {
|
||||
if (ps.state != 'Z') {
|
||||
if (pid == getpid())
|
||||
pr_err("The crtools itself is withing dumped tree.\n");
|
||||
pr_err("The crtools itself is within dumped tree.\n");
|
||||
else
|
||||
pr_err("Unseizeable non-zombie %d found, state %c, err %d/%d\n",
|
||||
pr_err("Unseizable non-zombie %d found, state %c, err %d/%d\n",
|
||||
pid, ps.state, ret, ptrace_errno);
|
||||
return -1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p, int
|
|||
aux = sizeof(info);
|
||||
ret = getsockopt(lfd, SOL_TCP, TCP_INFO, &info, &aux);
|
||||
if (ret) {
|
||||
pr_perror("Failt to obtain TCP_INFO");
|
||||
pr_perror("Failed to obtain TCP_INFO");
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
|
|
|||
4
sk-tcp.c
4
sk-tcp.c
|
|
@ -62,7 +62,7 @@ static int refresh_inet_sk(struct inet_sk_desc *sk)
|
|||
struct tcp_info info;
|
||||
|
||||
if (dump_opt(sk->rfd, SOL_TCP, TCP_INFO, &info)) {
|
||||
pr_perror("Failt to obtain TCP_INFO");
|
||||
pr_perror("Failed to obtain TCP_INFO");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
|
|||
* Initial options
|
||||
*/
|
||||
|
||||
pr_info("Reasing options for socket\n");
|
||||
pr_info("Reading options for socket\n");
|
||||
ret = tcp_stream_get_options(sk->rfd, &tse);
|
||||
if (ret < 0)
|
||||
goto err_opt;
|
||||
|
|
|
|||
|
|
@ -608,7 +608,7 @@ int collect_sockets(int pid)
|
|||
tmp = do_collect_req(nl, &req, sizeof(req), packet_receive_one, NULL);
|
||||
if (tmp) {
|
||||
if (pid != 0 && tmp == -ENOENT) /* Fedora 19 */
|
||||
pr_warn("The currect kernel doesn't support packet_diag\n");
|
||||
pr_warn("The current kernel doesn't support packet_diag\n");
|
||||
else
|
||||
err = tmp;
|
||||
}
|
||||
|
|
@ -619,7 +619,7 @@ int collect_sockets(int pid)
|
|||
tmp = do_collect_req(nl, &req, sizeof(req), netlink_receive_one, NULL);
|
||||
if (tmp) {
|
||||
if (pid != 0 && tmp == -ENOENT) /* Going to be in 3.10 */
|
||||
pr_warn("The currect kernel doesn't support netlink_diag\n");
|
||||
pr_warn("The current kernel doesn't support netlink_diag\n");
|
||||
else
|
||||
err = tmp;
|
||||
}
|
||||
|
|
|
|||
2
tty.c
2
tty.c
|
|
@ -1201,7 +1201,7 @@ int tty_prep_fds(struct cr_options *opts)
|
|||
return 0;
|
||||
|
||||
if (!isatty(STDIN_FILENO)) {
|
||||
pr_err("Standart stream is not a terminal, aborting\n");
|
||||
pr_err("Standard stream is not a terminal, aborting\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
2
util.c
2
util.c
|
|
@ -361,7 +361,7 @@ int clone_service_fd(int id)
|
|||
if (ret == -1) {
|
||||
if (errno == EBADF)
|
||||
continue;
|
||||
pr_perror("Unalbe to clone %d->%d\n", old, new);
|
||||
pr_perror("Unable to clone %d->%d\n", old, new);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue