diff options
-rw-r--r-- | init/Kconfig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig index 247084be0590..a7bcd87ca384 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1106,7 +1106,6 @@ config IPC_NS | |||
1106 | 1106 | ||
1107 | config USER_NS | 1107 | config USER_NS |
1108 | bool "User namespace" | 1108 | bool "User namespace" |
1109 | depends on UIDGID_CONVERTED | ||
1110 | select UIDGID_STRICT_TYPE_CHECKS | 1109 | select UIDGID_STRICT_TYPE_CHECKS |
1111 | 1110 | ||
1112 | default n | 1111 | default n |
@@ -1140,20 +1139,8 @@ config NET_NS | |||
1140 | 1139 | ||
1141 | endif # NAMESPACES | 1140 | endif # NAMESPACES |
1142 | 1141 | ||
1143 | config UIDGID_CONVERTED | ||
1144 | # True if all of the selected software conmponents are known | ||
1145 | # to have uid_t and gid_t converted to kuid_t and kgid_t | ||
1146 | # where appropriate and are otherwise safe to use with | ||
1147 | # the user namespace. | ||
1148 | bool | ||
1149 | default y | ||
1150 | |||
1151 | # Filesystems | ||
1152 | depends on XFS_FS = n | ||
1153 | |||
1154 | config UIDGID_STRICT_TYPE_CHECKS | 1142 | config UIDGID_STRICT_TYPE_CHECKS |
1155 | bool "Require conversions between uid/gids and their internal representation" | 1143 | bool "Require conversions between uid/gids and their internal representation" |
1156 | depends on UIDGID_CONVERTED | ||
1157 | default n | 1144 | default n |
1158 | help | 1145 | help |
1159 | While the nececessary conversions are being added to all subsystems this option allows | 1146 | While the nececessary conversions are being added to all subsystems this option allows |