mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

mount: always report ->mnt_id as decimal

Browse Source 
validate_mounts() prints ->mnt_id in hex when it reports the failure.
This complicates the understanding because this ->mnt_id is printed as
decimal elsewhere, including /proc/$pid/mountinfo.

parse_mountinfo() adds "0x" at least and this is just pr_info(), but
lets change it too.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Andrew Vagin <avagin@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Oleg Nesterov
2015-03-26 19:08:00 +03:00
committed by Pavel Emelyanov
parent 8329f06145
commit 57db932a0a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mount.c
View File

@@ -591,7 +591,7 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
if (fsroot_mounted(m)) { if (fsroot_mounted(m)) {
if (m->fstype->code == FSTYPE__UNSUPPORTED) { if (m->fstype->code == FSTYPE__UNSUPPORTED) {
pr_err("FS mnt %s dev %#x root %s unsupported id %x\n", pr_err("FS mnt %s dev %#x root %s unsupported id %d\n",
m->mountpoint, m->s_dev, m->root, m->mnt_id); m->mountpoint, m->s_dev, m->root, m->mnt_id);
return -1; return -1;
} }

2
proc_parse.c
View File

@@ -1034,7 +1034,7 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid)
goto err; goto err;
} }
pr_info("\ttype %s source %s mnt_id %#x s_dev %#x %s @ %s flags %#x options %s\n", pr_info("\ttype %s source %s mnt_id %d s_dev %#x %s @ %s flags %#x options %s\n",
fst ? : new->fstype->name, new->source, fst ? : new->fstype->name, new->source,
new->mnt_id, new->s_dev, new->root, new->mountpoint, new->mnt_id, new->s_dev, new->root, new->mountpoint,
new->flags, new->options); new->flags, new->options);