From b554eacb51643c7daabe7fe88cbcc84cc7bb622d Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Mon, 7 Oct 2019 11:45:13 +0300 Subject: [PATCH] mount: replace mountpoint to mnt_id in error messages Replace in restore_shared_options "->mountpoint" in messages with more descriptive "->mnt_id". Mountpoints concide a lot, and mnt_id is unique. These also makes a message shorter. (We already print a mapping from mnt_id to mountpoint in mnt_tree_show, so we can easily find mountpoint if we want). Signed-off-by: Pavel Tikhomirov --- criu/mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/criu/mount.c b/criu/mount.c index c3f0d8eed..fd0341e02 100644 --- a/criu/mount.c +++ b/criu/mount.c @@ -1868,15 +1868,15 @@ static int restore_shared_options(struct mount_info *mi, bool private, bool shar } if (private && mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) { - pr_perror("Unable to make %s private", mi->mountpoint); + pr_perror("Unable to make %d private", mi->mnt_id); return -1; } if (slave && mount(NULL, mi->mountpoint, NULL, MS_SLAVE, NULL)) { - pr_perror("Unable to make %s slave", mi->mountpoint); + pr_perror("Unable to make %d slave", mi->mnt_id); return -1; } if (shared && mount(NULL, mi->mountpoint, NULL, MS_SHARED, NULL)) { - pr_perror("Unable to make %s shared", mi->mountpoint); + pr_perror("Unable to make %d shared", mi->mnt_id); return -1; }