[CRIU] [PATCH] pie: Formatting and typo fixes
Christopher Covington
cov at codeaurora.org
Tue Jul 28 09:49:07 PDT 2015
Also remove the cast of a pointer-to-void variable to the type
it already is.
Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
pie/parasite.c | 6 +++---
pie/restorer.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pie/parasite.c b/pie/parasite.c
index fa87599..cbaff4a 100644
--- a/pie/parasite.c
+++ b/pie/parasite.c
@@ -510,7 +510,7 @@ static int __parasite_daemon_wait_msg(struct ctl_msg *m)
{
int ret;
- pr_debug("Daemon wais for command\n");
+ pr_debug("Daemon waits for command\n");
while (1) {
*m = (struct ctl_msg){ };
@@ -645,8 +645,8 @@ static noinline int unmap_itself(void *data)
sys_munmap(args->parasite_start, args->parasite_len);
/*
- * sys_munmap never return back. The controll process must
- * trap us on the exit from munmap
+ * This call to sys_munmap must never return. Instead, the controlling
+ * process must trap us on the exit from munmap.
*/
BUG();
diff --git a/pie/restorer.c b/pie/restorer.c
index 48c2844..3bdb5a3 100644
--- a/pie/restorer.c
+++ b/pie/restorer.c
@@ -440,7 +440,7 @@ long __export_restore_thread(struct thread_restore_args *args)
restore_pdeath_sig(args);
if (args->ta->seccomp_mode != SECCOMP_MODE_DISABLED)
- pr_info("restoring seccomp mode %d for %ld\n", args->ta->seccomp_mode, sys_getpid());
+ pr_info("Restoring seccomp mode %d for %ld\n", args->ta->seccomp_mode, sys_getpid());
restore_finish_stage(CR_STATE_RESTORE_CREDS);
futex_dec_and_wake(&thread_inprogress);
@@ -742,7 +742,7 @@ static int unmap_old_vmas(void *premmapped_addr, unsigned long premmapped_len,
void *p1, *p2;
int ret;
- if ((void *) premmapped_addr < bootstrap_start) {
+ if (premmapped_addr < bootstrap_start) {
p1 = premmapped_addr;
s1 = premmapped_len;
p2 = bootstrap_start;
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
More information about the CRIU
mailing list