tmpfs: fix XATTR N overriding POSIX_ACL Y

Choosing TMPFS_XATTR default N was switching off TMPFS_POSIX_ACL,
even if it had been Y in oldconfig; and Linus reports that PulseAudio
goes subtly wrong unless it can use ACLs on /dev/shm.

Make TMPFS_POSIX_ACL select TMPFS_XATTR (and depend upon TMPFS),
and move the TMPFS_POSIX_ACL entry before the TMPFS_XATTR entry,
to avoid asking unnecessary questions then ignoring their answers.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/Kconfig b/fs/Kconfig
index 979992dcb386d68f3fefd1c9edad6e3de9758118..f6edba2e069f3a4a13f3c06a4786cfa9ed2532c3 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -121,6 +121,20 @@ config TMPFS
 
          See <file:Documentation/filesystems/tmpfs.txt> for details.
 
+config TMPFS_POSIX_ACL
+       bool "Tmpfs POSIX Access Control Lists"
+       depends on TMPFS
+       select TMPFS_XATTR
+       select GENERIC_ACL
+       help
+         POSIX Access Control Lists (ACLs) support permissions for users and
+         groups beyond the owner/group/world scheme.
+
+         To learn more about Access Control Lists, visit the POSIX ACLs for
+         Linux website <http://acl.bestbits.at/>.
+
+         If you don't know what Access Control Lists are, say N.
+
 config TMPFS_XATTR
        bool "Tmpfs extended attributes"
        depends on TMPFS
@@ -133,22 +147,9 @@ config TMPFS_XATTR
          Currently this enables support for the trusted.* and
          security.* namespaces.
 
-         If unsure, say N.
-
          You need this for POSIX ACL support on tmpfs.
 
-config TMPFS_POSIX_ACL
-       bool "Tmpfs POSIX Access Control Lists"
-       depends on TMPFS_XATTR
-       select GENERIC_ACL
-       help
-         POSIX Access Control Lists (ACLs) support permissions for users and
-         groups beyond the owner/group/world scheme.
-
-         To learn more about Access Control Lists, visit the POSIX ACLs for
-         Linux website <http://acl.bestbits.at/>.
-
-         If you don't know what Access Control Lists are, say N.
+         If unsure, say N.
 
 config HUGETLBFS
        bool "HugeTLB file system support"