diff options
| -rw-r--r-- | compel/arch/x86/src/lib/infect.c | 4 | ||||
| -rw-r--r-- | criu/files.c | 2 | ||||
| -rw-r--r-- | criu/kerndat.c | 2 | ||||
| -rw-r--r-- | criu/mount-v2.c | 2 | ||||
| -rw-r--r-- | criu/net.c | 4 | ||||
| -rw-r--r-- | soccr/soccr.c | 4 | ||||
| -rw-r--r-- | test/zdtm/static/sk-unix-dgram-ghost.c | 4 | ||||
| -rw-r--r-- | test/zdtm/static/socket_aio.c | 2 | ||||
| -rw-r--r-- | test/zdtm/static/socket_listen.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c index d7865796e..98e2512e7 100644 --- a/compel/arch/x86/src/lib/infect.c +++ b/compel/arch/x86/src/lib/infect.c @@ -303,9 +303,9 @@ static int corrupt_extregs(pid_t pid) /* * Error log-level as: - * - not intended to be used outside of testing, + * - not intended to be used outside of testing; * - zdtm.py will grep it auto-magically from logs - * (and the seed will be known from an automatical testing) + * (and the seed will be known from automatic testing). */ pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, init_seed); diff --git a/criu/files.c b/criu/files.c index 9725b8ad1..8a2250e19 100644 --- a/criu/files.c +++ b/criu/files.c @@ -1254,7 +1254,7 @@ int close_old_fds(void) int fd, ret; /** - * Close previous /proc/self/ service fd, as we don't wan't to reuse it + * Close previous /proc/self/ service fd, as we don't want to reuse it * from a different task. Also there can be some junk fd in it's place * after we've moved our service fds (e.g. from other task of parents * shared fdtable), we need to close it before opendir_proc() below. diff --git a/criu/kerndat.c b/criu/kerndat.c index ec2d62ab0..2c1c2f79f 100644 --- a/criu/kerndat.c +++ b/criu/kerndat.c @@ -1306,7 +1306,7 @@ static int kerndat_has_pidfd_getfd(void) if (val_b == val_a) { kdat.has_pidfd_getfd = true; } else { - /* If val_b != val_a then something unexpected happend. */ + /* If val_b != val_a, something unexpected happened. */ pr_err("Unexpected value read from socket\n"); ret = -1; } diff --git a/criu/mount-v2.c b/criu/mount-v2.c index 570f78570..623016d42 100644 --- a/criu/mount-v2.c +++ b/criu/mount-v2.c @@ -778,7 +778,7 @@ static int populate_mnt_ns_v2(void) * all siblings which it overmounts (see __mnt_resort_children). The function * mnt_tree_for_each is effectively DFS (in case we don't postpone), thus all * descendants of all mounts which we sibling-overmount are mounted before us. - * Be carefull, we can't postpone (return >0) from this function because of it. + * Be careful, we can't postpone (return >0) from this function because of it. */ static int move_mount_to_tree(struct mount_info *mi) { diff --git a/criu/net.c b/criu/net.c index 550f4e2ee..2eff519c5 100644 --- a/criu/net.c +++ b/criu/net.c @@ -662,7 +662,7 @@ static int dump_macvlan(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nl ret = nla_parse_nested(data, IFLA_MACVLAN_FLAGS, info[IFLA_INFO_DATA], NULL); if (ret < 0) { - pr_err("failed ot parse macvlan data\n"); + pr_err("failed to parse macvlan data\n"); return -1; } @@ -772,7 +772,7 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr pr_info("Some data for SIT provided\n"); ret = nla_parse_nested(data, IFLA_IPTUN_MAX, info[IFLA_INFO_DATA], NULL); if (ret < 0) { - pr_err("failed ot parse sit data\n"); + pr_err("failed to parse sit data\n"); return -1; } diff --git a/soccr/soccr.c b/soccr/soccr.c index fb13a0d7b..abea93703 100644 --- a/soccr/soccr.c +++ b/soccr/soccr.c @@ -216,7 +216,7 @@ static int refresh_sk(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, str data->unsq_len = size; if (data->state == TCP_CLOSE) { - /* A connection could be reset. In thise case a sent queue + /* A connection could be reset. In this case a sent queue * may contain some data. A user can't read this data, so let's * ignore them. Otherwise we will need to add a logic whether * the send queue contains a fin packet or not and decide whether @@ -441,7 +441,7 @@ union libsoccr_addr *libsoccr_get_addr(struct libsoccr_sk *sk, int self, unsigne if (flags & ~GET_SA_FLAGS) return NULL; - /* FIXME -- implemented in CRIU, makes sence to have it here too */ + /* FIXME -- implemented in CRIU, makes sense to have it here too */ return NULL; } diff --git a/test/zdtm/static/sk-unix-dgram-ghost.c b/test/zdtm/static/sk-unix-dgram-ghost.c index fdf8fb18b..7c116fb19 100644 --- a/test/zdtm/static/sk-unix-dgram-ghost.c +++ b/test/zdtm/static/sk-unix-dgram-ghost.c @@ -198,11 +198,11 @@ int main(int argc, char **argv) test_msg("C/R complete\n"); - /* let childs to send data to server socket */ + /* Let children send data to server socket. */ for (i = 0; i < PROCESSES_NUM; i++) task_waiter_complete(&t[i], 2); - /* wait childs for send data */ + /* Wait for children to send data. */ for (i = 0; i < PROCESSES_NUM; i++) task_waiter_wait4(&t[i], 3); diff --git a/test/zdtm/static/socket_aio.c b/test/zdtm/static/socket_aio.c index a545483e1..4d228361f 100644 --- a/test/zdtm/static/socket_aio.c +++ b/test/zdtm/static/socket_aio.c @@ -51,7 +51,7 @@ int main(int argc, char **argv) if (pid == 0) { /* - * Chiled is client of TCP connection + * Child is client of TCP connection. */ close(fd_s); fd = tcp_init_client(AF_INET, "127.0.0.1", port); diff --git a/test/zdtm/static/socket_listen.c b/test/zdtm/static/socket_listen.c index 519107d01..14e321439 100644 --- a/test/zdtm/static/socket_listen.c +++ b/test/zdtm/static/socket_listen.c @@ -70,7 +70,7 @@ int main(int argc, char **argv) if (pid == 0) { /* - * Chiled is client of TCP connection + * Child is client of TCP connection. */ close(fd_s); fd = tcp_init_client(ZDTM_FAMILY, "localhost", port); |