[CRIU] [PATCH 6/8] criu/*c: fix typos
Kir Kolyshkin
kir at openvz.org
Thu Aug 4 14:54:56 PDT 2016
In comments:
cant -> can't
irrelevent -> irrelevant
sucess -> success
prepartion -> preparation
recepient -> recipient
lenght -> length
hexidecimal -> hexadecimal
becuase -> because
responce -> response
controll -> control
existance -> existence
alltogether -> altogether
comparision -> comparison
immediatly -> immediately
happenned -> happened
allready -> already
simplier -> simpler
succesfully -> successfully
absense -> absence
In debug messages:
Transfering -> Transferring
In error messages:
reponse -> response
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9bd1747..d64521f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2741,7 +2741,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
}
/*
- * Zap fields which we cant use.
+ * Zap fields which we can't use.
*/
args->creds.cap_inh = NULL;
args->creds.cap_eff = NULL;
@@ -2890,7 +2890,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
/*
* We're about to search for free VM area and inject the restorer blob
- * into it. No irrelevent mmaps/mremaps beyond this point, otherwise
+ * into it. No irrelevant mmaps/mremaps beyond this point, otherwise
* this unwanted mapping might get overlapped by the restorer.
*/
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 797d704..efe3c1a 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -781,7 +781,7 @@ static int chk_keepopen_req(CriuReq *msg)
/*
* Generic function to handle CRIU_REQ_TYPE__FEATURE_CHECK.
*
- * The function will have resp.sucess = true for most cases
+ * The function will have resp.success = true for most cases
* and the actual result will be in resp.features.
*
* For each feature which has been requested in msg->features
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 2b7a211..2a58335 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -447,7 +447,7 @@ out:
return ret;
}
-/* We separate the prepartion of PROCFS remaps because they allocate pstree
+/* We separate the preparation of PROCFS remaps because they allocate pstree
* items, which need to be seen by the root task. We can't do all remaps here,
* because the files haven't been loaded yet.
*/
diff --git a/criu/files.c b/criu/files.c
index a66a142..d5ffdab 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -153,7 +153,7 @@ out:
* 2. Open step.
* The one who creates the file (the 'master') creates one,
* then creates one more unix socket (transport) and sends the
- * created file over this socket to the other recepients.
+ * created file over this socket to the other recipients.
* 3. Receive step.
* Those, who wait for the file to appear, receive one via
* the transport socket, then close the socket and dup() the
diff --git a/criu/mount.c b/criu/mount.c
index f90ec69..0f81681 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -540,7 +540,7 @@ static inline int path_length(char *path)
off = strlen(path);
/*
- * If we're pure / then set lenght to zero so that adding this
+ * If we're pure / then set length to zero so that adding this
* value as sub-path offset would produce the correct result.
* E.g. the tail path of the "/foo/bar" relative to the "/foo"
* will be the "/foo/bar" + len("/foo") == "/bar", while the
@@ -1455,7 +1455,7 @@ static int make_bfmtm_magic_str(char *buf, BinfmtMiscEntry *bme)
/*
* Format is ":name:type(M):offset:magic:mask:interpreter:flags".
* Magic and mask are special fields. Kernel outputs them as
- * a sequence of hexidecimal numbers (abc -> 616263), and we
+ * a sequence of hexadecimal numbers (abc -> 616263), and we
* dump them without changes. But for registering a new entry
* it expects every byte is prepended with \x, i.e. \x61\x62\x63.
*/
@@ -3267,7 +3267,7 @@ static int __depopulate_roots_yard(void)
ret = 1;
}
/*
- * Don't exit after a first error, becuase this function
+ * Don't exit after a first error, because this function
* can be used to rollback in a error case.
* Don't worry about MNT_DETACH, because files are restored after this
* and nobody will not be restored from a wrong mount namespace.
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 47bb861..968abf1 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1101,7 +1101,7 @@ struct unsc_msg {
/*
* 0th is the call address
* 1st is the flags
- * 2nd is the optional (NULL in responce) arguments
+ * 2nd is the optional (NULL in response) arguments
*/
struct iovec iov[3];
char c[CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int))];
@@ -1281,10 +1281,10 @@ int __userns_call(const char *func_name, uns_call_t call, int flags,
/*
* Why don't we lock for async requests? Because
* they just put the request in the daemon's
- * queue and do not wait for the responce. Thus
- * when daemon responce there's only one client
+ * queue and do not wait for the response. Thus
+ * when daemon response there's only one client
* waiting for it in recvmsg below, so he
- * responces to proper caller.
+ * responses to proper caller.
*/
mutex_lock(&task_entries->userns_sync_lock);
else
@@ -1350,7 +1350,7 @@ static int start_usernsd(void)
* b) Make callers note the damon death by seeing the
* disconnected socket. In case of dgram socket
* callers would just get stuck in receiving the
- * responce.
+ * response.
*/
if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, sk)) {
diff --git a/criu/net.c b/criu/net.c
index a03c168..006ca03 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1018,7 +1018,7 @@ static int restore_links(int pid, NetnsEntry **netns)
/*
* optimize restore of devices configuration except lo
* lo is created with namespace and before default is set
- * so we cant optimize its restore
+ * so we can't optimize its restore
*/
if (nde->type == ND_TYPE__LOOPBACK)
def_netns = NULL;
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 0da20e2..e2a549f 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -412,7 +412,7 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp,
unsigned int cur_hole = 0;
int ret;
- pr_debug("Transfering pages:\n");
+ pr_debug("Transferring pages:\n");
list_for_each_entry(ppb, &pp->bufs, l) {
unsigned int i;
@@ -489,7 +489,7 @@ static int page_server_check_parent(int sk, struct page_server_iov *pi)
return -1;
if (write(sk, &ret, sizeof(ret)) != sizeof(ret)) {
- pr_perror("Unable to send reponse");
+ pr_perror("Unable to send response");
return -1;
}
@@ -564,7 +564,7 @@ static int page_server_open(int sk, struct page_server_iov *pi)
char has_parent = !!cxfer.loc_xfer.parent;
if (write(sk, &has_parent, 1) != 1) {
- pr_perror("Unable to send reponse");
+ pr_perror("Unable to send response");
close_page_xfer(&cxfer.loc_xfer);
return -1;
}
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0113586..f2d5f44 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -949,7 +949,7 @@ static void restore_posix_timers(struct task_restore_args *args)
}
/*
- * sys_munmap must not return here. The controll process must
+ * sys_munmap must not return here. The control process must
* trap us on the exit from sys_munmap.
*/
#ifdef CONFIG_VDSO
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index d90fd12..14d7d14 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -147,7 +147,7 @@ int recv_fds(int sock, int *fds, int nr_fds, struct fd_opts *opts)
min_fd = (cmsg->cmsg_len - sizeof(struct cmsghdr)) / sizeof(int);
/*
- * In case if kernel screwed the recepient, most probably
+ * In case if kernel screwed the recipient, most probably
* the caller stack frame will be overwriten, just scream
* and exit.
*
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index b5106c6..3cbd51c 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -307,7 +307,7 @@ static int vma_get_mapfile(char *fname, struct vma_area *vma, DIR *mfd,
/*
* Another bad thing is that kernel first checks
* for permission access to ANY map_files link,
- * then checks for its existance. So we have to
+ * then checks for its existence. So we have to
* check for file path being empty to "emulate"
* the ENOENT case.
*/
@@ -436,7 +436,7 @@ int parse_self_maps_lite(struct vm_area_list *vms)
/*
* This list is needed for one thing only -- to
* get the idea of what parts of current address
- * space are busy. So merge them alltogether.
+ * space are busy. So merge them altogether.
*/
prev->e->end = e;
else {
@@ -2505,11 +2505,11 @@ bool proc_status_creds_dumpable(struct proc_status_creds *parent,
offsetof(struct proc_status_creds, cap_inh);
/*
- * The comparision rules are the following
+ * The comparison rules are the following
*
* - CAPs can be different
* - seccomp filters should be passed via
- * semantic comparision (FIXME) but for
+ * semantic comparison (FIXME) but for
* now we require them to be exactly
* identical
* - the rest of members must match
diff --git a/criu/ptrace.c b/criu/ptrace.c
index 45271c6..3d2f56e 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -111,7 +111,7 @@ static int skip_sigstop(int pid, int nr_signals)
* SGISTOP can't be blocked, so we need to wait when the kernel
* handles this signal.
*
- * Otherwise the process will be stopped immediatly after
+ * Otherwise the process will be stopped immediately after
* starting it.
*
* 2) A seized task was stopped:
diff --git a/criu/rst-malloc.c b/criu/rst-malloc.c
index 35b92ba..2e89d59 100644
--- a/criu/rst-malloc.c
+++ b/criu/rst-malloc.c
@@ -214,7 +214,7 @@ static int rst_mem_remap_one(struct rst_mem_type_s *t, void *to)
if (!t->buf)
/*
- * No allocations happenned from this buffer.
+ * No allocations happened from this buffer.
* It's safe just to do nothing.
*/
return 0;
diff --git a/criu/seize.c b/criu/seize.c
index 78cc1f8..4019bd6 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -600,7 +600,7 @@ static int collect_threads(struct pstree_item *item)
goto err;
}
- /* The number of threads can't be less than allready frozen */
+ /* The number of threads can't be less than already frozen */
item->threads = xrealloc(item->threads, nr_threads * sizeof(struct pid));
if (item->threads == NULL)
return -1;
diff --git a/criu/tty.c b/criu/tty.c
index ec09f30..a2fda70 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -451,7 +451,7 @@ static struct file_desc *pty_alloc_reg(struct tty_info *info, bool add)
* @info as a template we generate that named 'inverted-path'.
*
* For example if the master peer was /dev/pts/ptmx with index 1,
- * the inverted path is /dev/pts/1, for inverted slaves it's simplier
+ * the inverted path is /dev/pts/1, for inverted slaves it's simpler
* we just add 'ptmx' postfix.
*/
static struct reg_file_info *pty_alloc_fake_reg(struct tty_info *info, int subtype)
@@ -1964,7 +1964,7 @@ static void tty_dinfo_free(struct tty_dump_info *dinfo)
* Dumping queued data must be done at the very end of the
* checkpoint procedure -- it's tail optimization, we trying
* to defer this procedure until everything else passed
- * succesfully because in real it is time consuming on
+ * successfully because in real it is time consuming on
* its own which might require writting data back to the
* former peers if case something go wrong.
*
diff --git a/criu/tun.c b/criu/tun.c
index dec730d..b3b8f8f 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -35,7 +35,7 @@
#endif
/*
- * Absense of the 1st ioctl means we cannot restore tun link. But
+ * Absence of the 1st ioctl means we cannot restore tun link. But
* since the 2nd one appeared at the same time, we'll "check" this
* by trying to dump filter and abort dump if it's not there.
*/
--
2.7.4
More information about the CRIU
mailing list