drm/msm/a6xx: avoid shadow NULL reference in failure path

[mirror_ubuntu-hirsute-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index aa4c122823018b756cdc566c33e20dbf834dfb10..0c746425b5689c0270b7fca3b5b71fa8754c63d3 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -123,6 +123,24 @@ source "fs/autofs/Kconfig"
 source "fs/fuse/Kconfig"
 source "fs/overlayfs/Kconfig"
 
+config SHIFT_FS
+       tristate "UID/GID shifting overlay filesystem for containers"
+       help
+         This filesystem can overlay any mounted filesystem and shift
+         the uid/gid the files appear at.  The idea is that
+         unprivileged containers can use this to mount root volumes
+         using this technique.
+
+config SHIFT_FS_POSIX_ACL
+       bool "shiftfs POSIX Access Control Lists"
+       depends on SHIFT_FS
+       select FS_POSIX_ACL
+       help
+         POSIX Access Control Lists (ACLs) support permissions for users and
+         groups beyond the owner/group/world scheme.
+
+         If you don't know what Access Control Lists are, say N.
+
 menu "Caches"
 
 source "fs/fscache/Kconfig"
@@ -203,7 +221,7 @@ config TMPFS_XATTR
 
 config TMPFS_INODE64
        bool "Use 64-bit ino_t by default in tmpfs"
-       depends on TMPFS && 64BIT
+       depends on TMPFS && 64BIT && !(S390 || ALPHA)
        default n
        help
          tmpfs has historically used only inode numbers as wide as an unsigned
@@ -288,6 +306,7 @@ source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/erofs/Kconfig"
 source "fs/vboxsf/Kconfig"
+source "fs/aufs/Kconfig"
 
 endif # MISC_FILESYSTEMS