[Devel] [PATCH RHEL9 COMMIT] mount: Rename do_set_group() to do_set_group_old()

Konstantin Khorenko khorenko at virtuozzo.com
Thu Apr 20 20:45:56 MSK 2023


The commit is pushed to "branch-rh9-5.14.0-162.18.1.vz9.19.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-162.18.1.vz9.19.7
------>
commit 990e1c8801fe266259ac24e26bb9803ba03a0e4b
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Fri Apr 7 14:36:48 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 related patches
    
    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.sw.ru/browse/PSBM-144416
    
    Feature: mount: port move_mount_set_group related patches
---
 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);


More information about the Devel mailing list