Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Append newline when using pr_err()

Browse source 
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Acked-by: Andrew Vagin <avagin@odin.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin 2015-10-07 09:19:48 -07:00 • committed by Pavel Emelyanov
parent 572f152ea0
commit 17b92fa542
12 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cr-check.c
View file

@ -678,7 +678,7 @@ static int check_aio_remap(void)
int r;
if (sys_io_setup(16, &ctx) < 0) {
pr_err("No AIO syscall");
pr_err("No AIO syscall\n");
return -1;
}

2
fsnotify.c
View file

@ -491,7 +491,7 @@ static int restore_one_inotify(int inotify_fd, struct fsnotify_mark_info *info)
ret = 0;
break;
} else if (wd > iwe->wd) {
pr_err("Unsorted watch 0x%x found for 0x%x with 0x%x", wd, inotify_fd, iwe->wd);
pr_err("Unsorted watch 0x%x found for 0x%x with 0x%x\n", wd, inotify_fd, iwe->wd);
break;
}

4
mount.c
View file

@ -346,7 +346,7 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list, bool inser
if (!mounts_equal(root, m, true) ||
strcmp(root->root, m->root)) {
pr_err("Nested mount namespaces with different "
"roots %d (@%s %s) %d (@%s %s) are not supported yet",
"roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
root->mnt_id, root->mountpoint, root->root,
m->mnt_id, m->mountpoint, m->root);
return NULL;
@ -816,7 +816,7 @@ static struct ns_id *find_ext_ns_id(void)
return ns;
}
pr_err("Failed to find criu pid's mount ns!");
pr_err("Failed to find criu pid's mount ns\n");
return NULL;
}

2
namespaces.c
View file

@ -740,7 +740,7 @@ static int do_dump_namespaces(struct ns_id *ns)
ret = dump_net_ns(ns->id);
break;
default:
pr_err("Unknown namespace flag %x", ns->nd->cflag);
pr_err("Unknown namespace flag %x\n", ns->nd->cflag);
break;
}

2
net.c
View file

@ -498,7 +498,7 @@ static int restore_links(int pid, NetnsEntry **netns)
ret = restore_link(nde, nlsk);
if (ret) {
pr_err("can not restore link");
pr_err("Can't restore link\n");
goto exit;
}

2
pie/piegen/elf.c
View file

@ -405,7 +405,7 @@ int handle_elf(void *mem, size_t size)
place, value64);
/* check that we are dealing with the addi 2,2 instruction */
if (((*(uint32_t*)where) & 0xffff0000) != 0x38420000) {
pr_err("Unexpected instruction for R_PPC64_REL16_LO");
pr_err("Unexpected instruction for R_PPC64_REL16_LO\n");
goto err;
}
*(uint16_t *)where = value64 & 0xffff;

4
pie/restorer.c
View file

@ -412,7 +412,7 @@ long __export_restore_thread(struct thread_restore_args *args)
ksigfillset(&to_block);
ret = sys_sigprocmask(SIG_SETMASK, &to_block, NULL, sizeof(k_rtsigset_t));
if (ret) {
pr_err("Unable to block signals %d", ret);
pr_err("Unable to block signals %d\n", ret);
goto core_restore_end;
}
@ -1217,7 +1217,7 @@ long __export_restore_task(struct task_restore_args *args)
ksigfillset(&to_block);
ret = sys_sigprocmask(SIG_SETMASK, &to_block, NULL, sizeof(k_rtsigset_t));
if (ret) {
pr_err("Unable to block signals %ld", ret);
pr_err("Unable to block signals %ld\n", ret);
goto core_restore_end;
}

2
plugin.c
View file

@ -96,7 +96,7 @@ static int cr_lib_load(int stage, char *path)
h = dlopen(path, RTLD_LAZY);
if (h == NULL) {
pr_err("Unable to load %s: %s", path, dlerror());
pr_err("Unable to load %s: %s\n", path, dlerror());
return -1;
}

4
proc_parse.c
View file

@ -770,7 +770,7 @@ int parse_pid_status(pid_t pid, struct proc_status_creds *cr)
if (!strncmp(str, "PPid:", 5)) {
if (sscanf(str, "PPid:\t%d", &cr->ppid) != 1) {
pr_err("Unable to parse: %s", str);
pr_err("Unable to parse: %s\n", str);
goto err_parse;
}
done++;
@ -1683,7 +1683,7 @@ static int parse_file_lock_buf(char *buf, struct file_lock *fl,
}
if (num < 10) {
pr_err("Invalid file lock info (%d): %s", num, buf);
pr_err("Invalid file lock info (%d): %s\n", num, buf);
return -1;
}

2
seize.c
View file

@ -47,7 +47,7 @@ static const char *get_freezer_state(int fd)
if (strcmp(path, thawed) == 0)
return thawed;
pr_err("Unknown freezer state: %s", path);
pr_err("Unknown freezer state: %s\n", path);
err:
return NULL;
}

2
sk-unix.c
View file

@ -1051,7 +1051,7 @@ static int open_unixsk_pair_slave(struct unix_sk_info *ui)
sk = recv_fd(fle->fe->fd);
if (sk < 0) {
pr_err("Can't recv pair slave");
pr_err("Can't recv pair slave\n");
return -1;
}
close(fle->fe->fd);

2
util.c
View file

@ -715,7 +715,7 @@ int mkdirpat(int fd, const char *path)
char made_path[PATH_MAX], *pos;
if (strlen(path) >= PATH_MAX) {
pr_err("path %s is longer than PATH_MAX", path);
pr_err("path %s is longer than PATH_MAX\n", path);
return -1;
}