[Devel] [PATCH RHEL7 COMMIT] xfs: allow to mount XFS in non-init 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.12
------>
commit 54c5b52bc8deb98bd96eebcf6b57021ef6e5c28a
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Wed Jul 4 17:42:53 2018 +0300

    xfs: allow to mount XFS in non-init userns
    
    At the moment XFS is not marked as ready to be mounted inside non-init
    userns (see xfs_fs_type), while we previously decided to allow using XFS
    inside a CT:
      b86b9049ba50 ("xfs: allow to mount xfs fs inside a Container")
      https://jira.sw.ru/browse/PSBM-72401
    
    so let's mark XFS as mount-able inside non-init userns.
    
    Fixes: b86b9049ba50 ("xfs: allow to mount xfs fs inside a Container")
    https://jira.sw.ru/browse/PSBM-86369
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 fs/xfs/xfs_super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 21ad5940b8cc..f6d8f8532da8 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1753,7 +1753,7 @@ static struct file_system_type xfs_fs_type = {
 	.fs_flags		= FS_REQUIRES_DEV | FS_HAS_RM_XQUOTA |
 				  FS_HAS_INVALIDATE_RANGE | FS_HAS_DIO_IODONE2 |
 				  FS_HAS_NEXTDQBLK | FS_HAS_WBLIST |
-				  FS_VIRTUALIZED,
+				  FS_USERNS_MOUNT | FS_VIRTUALIZED,
 };
 MODULE_ALIAS_FS("xfs");