From 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 25 May 2011 19:49:18 -0700 Subject: 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 Signed-off-by: Linus Torvalds --- fs/Kconfig | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 979992dcb386..f6edba2e069f 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -121,6 +121,20 @@ config TMPFS See 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 . + + 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 . - - If you don't know what Access Control Lists are, say N. + If unsure, say N. config HUGETLBFS bool "HugeTLB file system support" -- cgit v1.2.3-59-g8ed1b