[RHEL8,COMMIT] ve/fs/nfs: NFS containerization - allow to mount NFS inside non-root userns

Submitted by Konstantin Khorenko on March 18, 2021, 11:03 a.m.

Details

Message ID 202103181103.12IB3PdL644789@finist-co8.sw.ru
State New
Series "ve/fs/namespace: allow submounts in non-init userns"
Headers show

Commit Message

Konstantin Khorenko March 18, 2021, 11:03 a.m.
The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.8
------>
commit 1a546edf00304db93f89c249451fb92d188326ee
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Wed Mar 17 20:06:30 2021 +0300

    ve/fs/nfs: NFS containerization - allow to mount NFS inside non-root userns
    
    Fixes: 25ba8fad0662 ("ve/fs/nfs: NFS containerization")
    https://jira.sw.ru/browse/PSBM-127234
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/nfs/super.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 3093cb4dac13..c7ccb9805219 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -304,7 +304,7 @@  struct file_system_type nfs_fs_type = {
 	.mount		= nfs_fs_mount,
 	.kill_sb	= nfs_kill_super,
 	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA|
-			  FS_VIRTUALIZED,
+			  FS_VIRTUALIZED|FS_USERNS_MOUNT,
 };
 MODULE_ALIAS_FS("nfs");
 EXPORT_SYMBOL_GPL(nfs_fs_type);
@@ -344,7 +344,7 @@  struct file_system_type nfs4_fs_type = {
 	.mount		= nfs_fs_mount,
 	.kill_sb	= nfs_kill_super,
 	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA|
-			  FS_VIRTUALIZED,
+			  FS_VIRTUALIZED|FS_USERNS_MOUNT,
 };
 MODULE_ALIAS_FS("nfs4");
 MODULE_ALIAS("nfs4");