mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

mnt: Fix slave mounts order estimation in can_mount_now

Browse Source 
For slave mount we need to make sure that all childrent
mountpoints of the master peer is mounted before we can
proceed otherwise there gonna be duplicated mountpoints
after the restore.

https://jira.sw.ru/browse/PSBM-39957

Signed-off-by: Andrew Vagin <avagin@odin.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrew Vagin 2015-10-09 14:06:00 +03:00 committed by Pavel Emelyanov
parent 1a6de2c643
commit addbc25550
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mount.c
View File

@ -2125,8 +2125,23 @@ static bool can_mount_now(struct mount_info *mi)
if (mi->external) if (mi->external)
return true; return true;
if (mi->master_id && mi->bind == NULL) /*
return false; * We're the slave peer:
* - Make sure the master peer is already mounted
* - Make sure all children is mounted as well to
* eliminame mounts duplications
*/
if (mi->master_id) {
struct mount_info *c;
if (mi->bind == NULL)
return false;
list_for_each_entry(c, &mi->bind->children, siblings) {
if (!c->mounted)
return false;
}
}
if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin && !mi->external)) if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin && !mi->external))
return false; return false;
@ -2143,9 +2158,6 @@ static bool can_mount_now(struct mount_info *mi)
list_for_each_entry(n, &p->mnt_share, mnt_share) list_for_each_entry(n, &p->mnt_share, mnt_share)
if (!n->mounted) if (!n->mounted)
return false; return false;
list_for_each_entry(n, &p->mnt_slave_list, mnt_slave)
if (!n->mounted)
return false;
} }
} }