[Devel] [PATCH RHEL7 COMMIT] mount: Rename do_set_group to do_set_group_old

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-1160.88.1.vz7.195.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.88.1.vz7.195.2
------>
commit a309d4717985de3190c73e75d0c2fe742ffa77dc
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Thu Apr 13 18:47:11 2023 +0800

    mount: Rename do_set_group to do_set_group_old
    
    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>
    
    =================
    Patchset description:
    mount: Port move_mount_set_group and mount_setattr
    
    We need this as in Virtuozzo criu after rebase to mainstream criu in u20
    we will switch to this new API for sharing group setting accross mounts.
    
    https://jira.vzint.dev/browse/PSBM-144416
---
 fs/namespace.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index fcfe15ed28f2..94f1e308b354 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2939,7 +2939,7 @@ static inline int tree_contains_unbindable(struct mount *mnt)
 	return 0;
 }
 
-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;
@@ -3525,7 +3525,7 @@ long do_mount(const char *dev_name, const char __user *dir_name,
 	else if (cmd & MS_MOVE)
 		retval = do_move_mount_old(&path, dev_name);
 	else if (cmd & MS_SET_GROUP)
-		retval = do_set_group(&path, dev_name);
+		retval = do_set_group_old(&path, dev_name);
 	else
 		retval = do_new_mount(&path, type_page, flags, mnt_flags,
 				      dev_name, data_page);