[Devel] [PATCH RH9 1/6] mount: rename do_set_group to do_set_group_old

[Pavel Tikhomirov]

We have a VZ-only feature to copy mount sharing between mounts via mount
syscall, to be able to handle mount restore in CRIU u15-u19 efficiently.

In mainstream there is now similar feature through move_mount syscall.

To support both old criu and new criu, which uses ms API, at the same
time let's fix name collision and leave both variants for now, several
updates later we can drop old mount syscall based API.

https://jira.sw.ru/browse/PSBM-144416
Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 fs/namespace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 5ab41c9f09f0..99f54669929f 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2950,7 +2950,7 @@ static bool check_for_nsfs_mounts(struct mount *subtree)
 	return ret;
 }
 
-static int do_set_group(struct path *path, const char *sibling_name)
+static int do_set_group_old(struct path *path, const char *sibling_name)
 {
 	struct ve_struct *ve = get_exec_env();
 	struct mount *sibling, *mnt;
@@ -3554,7 +3554,7 @@ int path_mount(const char *dev_name, struct path *path,
 	if (flags & MS_MOVE)
 		return do_move_mount_old(path, dev_name);
 	if (flags & MS_SET_GROUP)
-		return do_set_group(path, dev_name);
+		return do_set_group_old(path, dev_name);
 
 	return do_new_mount(path, type_page, sb_flags, mnt_flags, dev_name,
 			    data_page);
-- 
2.39.2