[CRIU] [PATCH 1/3] mnt: Rename collect_shared and remove unused for_dump argument

Pavel Emelyanov xemul at parallels.com
Tue Sep 22 04:49:19 PDT 2015


Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 mount.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mount.c b/mount.c
index 3ded7a4..77d5e77 100644
--- a/mount.c
+++ b/mount.c
@@ -911,7 +911,7 @@ static int resolve_external_mounts(struct mount_info *info)
 	return 0;
 }
 
-static int collect_shared(struct mount_info *info, bool for_dump)
+static int resolve_shared_mounts(struct mount_info *info)
 {
 	struct mount_info *m, *t;
 
@@ -2691,7 +2691,7 @@ static int populate_mnt_ns(void)
 	if (!pms)
 		return -1;
 
-	if (collect_shared(mntinfo, false))
+	if (resolve_shared_mounts(mntinfo))
 		return -1;
 
 	for (nsid = ns_ids; nsid; nsid = nsid->next) {
@@ -2979,7 +2979,7 @@ int collect_mnt_namespaces(bool for_dump)
 	if (arg.need_to_validate) {
 		ret = -1;
 
-		if (collect_shared(mntinfo, true))
+		if (resolve_shared_mounts(mntinfo))
 			goto err;
 		if (validate_mounts(mntinfo, true))
 			goto err;
-- 
1.9.3



More information about the CRIU mailing list