mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-04 00:05:26 +00:00
Fix typos in comments
This is less useful than fixing typos in output messages, but anyway. Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
committed by
Pavel Emelyanov
parent
d90d4b1b88
commit
41c7ca8218
12
cr-restore.c
12
cr-restore.c
@@ -189,7 +189,7 @@ err:
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Map a private vma, if it is not mapped by a parrent yet */
|
/* Map a private vma, if it is not mapped by a parent yet */
|
||||||
static int map_private_vma(pid_t pid, struct vma_area *vma, void *tgt_addr,
|
static int map_private_vma(pid_t pid, struct vma_area *vma, void *tgt_addr,
|
||||||
struct vma_area **pvma, struct list_head *pvma_list)
|
struct vma_area **pvma, struct list_head *pvma_list)
|
||||||
{
|
{
|
||||||
@@ -1090,7 +1090,7 @@ static int restore_task_with_children(void *_arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The block mask will be restored in sigresturn.
|
* The block mask will be restored in sigreturn.
|
||||||
*
|
*
|
||||||
* TODO: This code should be removed, when a freezer will be added.
|
* TODO: This code should be removed, when a freezer will be added.
|
||||||
*/
|
*/
|
||||||
@@ -1809,7 +1809,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
|
|||||||
ret = open_signal_image(CR_FD_SIGNAL, pid, &siginfo_chunk,
|
ret = open_signal_image(CR_FD_SIGNAL, pid, &siginfo_chunk,
|
||||||
&siginfo_size, &siginfo_nr);
|
&siginfo_size, &siginfo_nr);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (errno != ENOENT) /* backward compatiblity */
|
if (errno != ENOENT) /* backward compatibility */
|
||||||
goto err;
|
goto err;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
@@ -1820,7 +1820,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
|
|||||||
current->threads[i].virt, &siginfo_chunk,
|
current->threads[i].virt, &siginfo_chunk,
|
||||||
&siginfo_size, &siginfo_nr);
|
&siginfo_size, &siginfo_nr);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (errno != ENOENT) /* backward compatiblity */
|
if (errno != ENOENT) /* backward compatibility */
|
||||||
goto err;
|
goto err;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
@@ -2075,8 +2075,8 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
|
|||||||
task_args->thread_args);
|
task_args->thread_args);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* An indirect call to task_restore, note it never resturns
|
* An indirect call to task_restore, note it never returns
|
||||||
* and restoreing core is extremely destructive.
|
* and restoring core is extremely destructive.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, task_args);
|
JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, task_args);
|
||||||
|
@@ -32,7 +32,7 @@ struct eventfd_file_info {
|
|||||||
struct file_desc d;
|
struct file_desc d;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Checks if file desciptor @lfd is eventfd */
|
/* Checks if file descriptor @lfd is eventfd */
|
||||||
int is_eventfd_link(int lfd)
|
int is_eventfd_link(int lfd)
|
||||||
{
|
{
|
||||||
return is_anon_link_type(lfd, "[eventfd]");
|
return is_anon_link_type(lfd, "[eventfd]");
|
||||||
|
@@ -39,7 +39,7 @@ struct eventpoll_tfd_file_info {
|
|||||||
|
|
||||||
static LIST_HEAD(eventpoll_tfds);
|
static LIST_HEAD(eventpoll_tfds);
|
||||||
|
|
||||||
/* Checks if file desciptor @lfd is eventfd */
|
/* Checks if file descriptor @lfd is eventfd */
|
||||||
int is_eventpoll_link(int lfd)
|
int is_eventpoll_link(int lfd)
|
||||||
{
|
{
|
||||||
return is_anon_link_type(lfd, "[eventpoll]");
|
return is_anon_link_type(lfd, "[eventpoll]");
|
||||||
|
4
fifo.c
4
fifo.c
@@ -19,11 +19,11 @@
|
|||||||
/*
|
/*
|
||||||
* FIFO checkpoint and restore is done in a bit unusual manner.
|
* FIFO checkpoint and restore is done in a bit unusual manner.
|
||||||
* We use files-reg.c engine to save fifo path and flags,
|
* We use files-reg.c engine to save fifo path and flags,
|
||||||
* thus regular files image will contain fifo descriptos which
|
* thus regular files image will contain fifo descriptors which
|
||||||
* are useless for reg-files engine itself but needed for our fifo
|
* are useless for reg-files engine itself but needed for our fifo
|
||||||
* engine.
|
* engine.
|
||||||
*
|
*
|
||||||
* In particual we dump fifo-entry automatically and appropriate
|
* In particular we dump fifo-entry automatically and appropriate
|
||||||
* reg-file entry manually, thus on restore we need to ask reg-file
|
* reg-file entry manually, thus on restore we need to ask reg-file
|
||||||
* engine to restore fifo path and flags via direct call.
|
* engine to restore fifo path and flags via direct call.
|
||||||
*/
|
*/
|
||||||
|
@@ -65,13 +65,13 @@ struct fsnotify_file_info {
|
|||||||
static LIST_HEAD(inotify_info_head);
|
static LIST_HEAD(inotify_info_head);
|
||||||
static LIST_HEAD(fanotify_info_head);
|
static LIST_HEAD(fanotify_info_head);
|
||||||
|
|
||||||
/* Checks if file desciptor @lfd is inotify */
|
/* Checks if file descriptor @lfd is inotify */
|
||||||
int is_inotify_link(int lfd)
|
int is_inotify_link(int lfd)
|
||||||
{
|
{
|
||||||
return is_anon_link_type(lfd, "inotify");
|
return is_anon_link_type(lfd, "inotify");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Checks if file desciptor @lfd is fanotify */
|
/* Checks if file descriptor @lfd is fanotify */
|
||||||
int is_fanotify_link(int lfd)
|
int is_fanotify_link(int lfd)
|
||||||
{
|
{
|
||||||
return is_anon_link_type(lfd, "[fanotify]");
|
return is_anon_link_type(lfd, "[fanotify]");
|
||||||
|
@@ -126,7 +126,7 @@ static unsigned int get_ns_id(int pid, struct ns_desc *nd)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX: Does it make sence to validate kernel links to <name>:[<id>]? */
|
/* XXX: Does it make sense to validate kernel links to <name>:[<id>]? */
|
||||||
kid = strtoul(ns_id + strlen(nd->str) + 2, &end, 10);
|
kid = strtoul(ns_id + strlen(nd->str) + 2, &end, 10);
|
||||||
return generate_ns_id(pid, kid, nd);
|
return generate_ns_id(pid, kid, nd);
|
||||||
}
|
}
|
||||||
@@ -226,7 +226,7 @@ int dump_namespaces(struct pid *ns_pid, unsigned int ns_flags)
|
|||||||
* parallel with task dumping routine.
|
* parallel with task dumping routine.
|
||||||
*
|
*
|
||||||
* However, the question how to dump sockets from the target
|
* However, the question how to dump sockets from the target
|
||||||
* net namesapce with this is still open
|
* net namespace with this is still open
|
||||||
*/
|
*/
|
||||||
|
|
||||||
pr_info("Dumping %d(%d)'s namespaces\n", ns_pid->virt, ns_pid->real);
|
pr_info("Dumping %d(%d)'s namespaces\n", ns_pid->virt, ns_pid->real);
|
||||||
|
@@ -103,7 +103,7 @@ static inline int try_add_page_to(struct page_pipe *pp, struct page_pipe_buf *pp
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ppb->nr_segs == UIO_MAXIOV)
|
if (ppb->nr_segs == UIO_MAXIOV)
|
||||||
/* XXX -- shink pipe back? */
|
/* XXX -- shrink pipe back? */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -176,7 +176,7 @@ retry_signal:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We've reached this point iif int3 is triggered inside our
|
* We've reached this point if int3 is triggered inside our
|
||||||
* parasite code. So we're done.
|
* parasite code. So we're done.
|
||||||
*/
|
*/
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
2
ptrace.c
2
ptrace.c
@@ -39,7 +39,7 @@ int unseize_task(pid_t pid, int st)
|
|||||||
/*
|
/*
|
||||||
* This routine seizes task putting it into a special
|
* This routine seizes task putting it into a special
|
||||||
* state where we can manipulate the task via ptrace
|
* state where we can manipulate the task via ptrace
|
||||||
* inteface, and finally we can detach ptrace out of
|
* interface, and finally we can detach ptrace out of
|
||||||
* of it so the task would not know if it was saddled
|
* of it so the task would not know if it was saddled
|
||||||
* up with someone else.
|
* up with someone else.
|
||||||
*/
|
*/
|
||||||
|
@@ -99,7 +99,7 @@ int dump_sk_queue(int sock_fd, int sock_id)
|
|||||||
size -= 32;
|
size -= 32;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate data for a streem.
|
* Allocate data for a stream.
|
||||||
*/
|
*/
|
||||||
data = xmalloc(size);
|
data = xmalloc(size);
|
||||||
if (!data)
|
if (!data)
|
||||||
@@ -135,7 +135,7 @@ int dump_sk_queue(int sock_fd, int sock_id)
|
|||||||
}
|
}
|
||||||
if (msg.msg_flags & MSG_TRUNC) {
|
if (msg.msg_flags & MSG_TRUNC) {
|
||||||
/*
|
/*
|
||||||
* DGRAM thuncated. This should not happen. But we have
|
* DGRAM truncated. This should not happen. But we have
|
||||||
* to check...
|
* to check...
|
||||||
*/
|
*/
|
||||||
pr_err("sys_recvmsg failed: truncated\n");
|
pr_err("sys_recvmsg failed: truncated\n");
|
||||||
@@ -208,9 +208,9 @@ int restore_sk_queue(int fd, unsigned int peer_id)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Don't try to use sendfile here, because it use sendpage() and
|
* Don't try to use sendfile here, because it use sendpage() and
|
||||||
* all data are splitted on pages and a new skb is allocated for
|
* all data are split on pages and a new skb is allocated for
|
||||||
* each page. It creates a big overhead on SNDBUF.
|
* each page. It creates a big overhead on SNDBUF.
|
||||||
* sendfile() isn't suatable for DGRAM sockets, because message
|
* sendfile() isn't suitable for DGRAM sockets, because message
|
||||||
* boundaries messages should be saved.
|
* boundaries messages should be saved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@@ -330,7 +330,7 @@ static int unix_collect_one(const struct unix_diag_msg *m,
|
|||||||
(int)uv->udiag_vfs_ino);
|
(int)uv->udiag_vfs_ino);
|
||||||
/*
|
/*
|
||||||
* When a socket is bound to unlinked file, we
|
* When a socket is bound to unlinked file, we
|
||||||
* just drop his name, since noone will access
|
* just drop his name, since no one will access
|
||||||
* it via one.
|
* it via one.
|
||||||
*/
|
*/
|
||||||
xfree(name);
|
xfree(name);
|
||||||
|
10
tty.c
10
tty.c
@@ -426,7 +426,7 @@ static int restore_tty_params(int fd, struct tty_info *info)
|
|||||||
* because it contain @c_cc array which
|
* because it contain @c_cc array which
|
||||||
* is bigger than TERMIOS_NCC. Same applies
|
* is bigger than TERMIOS_NCC. Same applies
|
||||||
* to winsize usage, we can't guarantee the
|
* to winsize usage, we can't guarantee the
|
||||||
* structure taked from the system headers will
|
* structure taken from the system headers will
|
||||||
* never be extended.
|
* never be extended.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -575,7 +575,7 @@ static int pty_open_unpaired_slave(struct file_desc *d, struct tty_info *slave)
|
|||||||
*
|
*
|
||||||
* Note, at this point the group/session should
|
* Note, at this point the group/session should
|
||||||
* be already restored properly thus we can simply
|
* be already restored properly thus we can simply
|
||||||
* use syscalls intead of lookup via process tree.
|
* use syscalls instead of lookup via process tree.
|
||||||
*/
|
*/
|
||||||
if (likely(slave->tie->sid == INHERIT_SID)) {
|
if (likely(slave->tie->sid == INHERIT_SID)) {
|
||||||
if (tty_set_prgp(fd, getpgid(getppid())))
|
if (tty_set_prgp(fd, getpgid(getppid())))
|
||||||
@@ -949,7 +949,7 @@ static int collect_one_tty(void *obj, ProtobufCMessage *msg)
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The tty peers which have no @termios are hunged up,
|
* The tty peers which have no @termios are hung up,
|
||||||
* so don't mark them as active, we create them with
|
* so don't mark them as active, we create them with
|
||||||
* faked master and they are rather a rudiment which
|
* faked master and they are rather a rudiment which
|
||||||
* can't be used. Most likely they appear if a user has
|
* can't be used. Most likely they appear if a user has
|
||||||
@@ -1083,7 +1083,7 @@ static int dump_pty_info(int lfd, u32 id, const struct fd_parms *p, int major, i
|
|||||||
pty.index = index;
|
pty.index = index;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Nothing we can do on hangin up terminal,
|
* Nothing we can do on hanging up terminal,
|
||||||
* just write out minimum information we can
|
* just write out minimum information we can
|
||||||
* gather.
|
* gather.
|
||||||
*/
|
*/
|
||||||
@@ -1095,7 +1095,7 @@ static int dump_pty_info(int lfd, u32 id, const struct fd_parms *p, int major, i
|
|||||||
* the task might have slave peer assigned but no
|
* the task might have slave peer assigned but no
|
||||||
* master peer. Such "detached" master peers are
|
* master peer. Such "detached" master peers are
|
||||||
* not yet supported by our tool and better to
|
* not yet supported by our tool and better to
|
||||||
* inform a user about such situatio,
|
* inform a user about such situation.
|
||||||
*/
|
*/
|
||||||
tty_test_and_set(id, tty_active_pairs);
|
tty_test_and_set(id, tty_active_pairs);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user