Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-27 03:56:05 +00:00
Code Issues Projects Releases Wiki Activity

mount: Add error messages

Browse source 
Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
This commit is contained in:
Radostin Stoyanov 2019-11-03 20:18:38 +00:00 • committed by Andrei Vagin
parent 75fcec0ecb
commit b50b6ea09e
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
criu/mount.c
View file

@ -1325,8 +1325,10 @@ int ns_open_mountpoint(void *arg)
}
/* Remount all mounts as private to disable propagation */
if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL))
if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
pr_perror("Unable to remount");
goto err;
}
if (umount_overmounts(mi))
goto err;
@ -1536,6 +1538,7 @@ static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_
ret = mount(source, target, type, 0, NULL);
if (ret < 0) {
pr_perror("Unable to mount %s %s", source, target);
exit_code = -errno;
goto restore_ns;
} else {
@ -2004,7 +2007,10 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
static int do_simple_mount(struct mount_info *mi, const char *src, const
char *fstype, unsigned long mountflags)
{
return mount(src, mi->mountpoint, fstype, mountflags, mi->options);
int ret = mount(src, mi->mountpoint, fstype, mountflags, mi->options);
if (ret)
pr_perror("Unable to mount %s %s (id=%d)", src, mi->mountpoint, mi->mnt_id);
return ret;
}
static char *mnt_fsname(struct mount_info *mi)
@ -2491,8 +2497,11 @@ static int do_mount_one(struct mount_info *mi)
}
/* do_mount_root() is called from populate_mnt_ns() */
if (mount(opts.root, mi->mountpoint, NULL, MS_BIND | MS_REC, NULL))
if (mount(opts.root, mi->mountpoint, NULL, MS_BIND | MS_REC, NULL)) {
pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->mountpoint, mi->mnt_id);
return -1;
}
if (do_mount_root(mi))
return -1;
mi->mounted = true;