[Devel] [PATCH RHEL7 COMMIT] ve/fs/autofs: allow to mount autofs inside non-root userns

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-862.3.2.vz7.61.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.3.2.vz7.61.6
------>
commit 0045b317c97bbe281413cf3ca46f46fe50e7c605
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Thu Jun 28 12:43:11 2018 +0300

    ve/fs/autofs: allow to mount autofs inside non-root userns
    
    We need autofs to be mounted inside Container and RHEL7.5 requires a
    special flag to be set on fs which are allowed to be mounted inside
    non-root user namespaces.
    
    Fixes: cb172d51e91c ve/fs/autofs: mark autofs as virtualized
    https://jira.sw.ru/browse/PSBM-86138
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 fs/autofs4/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
index c80fb66aade0..a06b5e9ac9c9 100644
--- a/fs/autofs4/init.c
+++ b/fs/autofs4/init.c
@@ -21,7 +21,7 @@ static struct file_system_type autofs_fs_type = {
 	.name		= "autofs",
 	.mount		= autofs_mount,
 	.kill_sb	= autofs4_kill_sb,
-	.fs_flags	= FS_VIRTUALIZED,
+	.fs_flags	= FS_VIRTUALIZED | FS_USERNS_MOUNT,
 };
 MODULE_ALIAS_FS("autofs");