Skip to contentSkip to conversation

New fs-specific Kconfig options should go in fs/$FS/Kconfig, not fs/Kconfig.

PATCH In review Jeff Mahoney 2 participants 2 messages Feb 4, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 New fs-specific Kconfig options should go in fs/$FS/Kconfig, not fs/Kconfig.

Commit 699b6faa2ab283219914501d5117f8a93c7e441b allowed btrfs ACLs to be selectable, but put the option in the main fs/Kconfig, and didn't make it depend on btrfs.

This patch moves the option and adds the dependency.

---

 fs/Kconfig       |   13 -------------
 fs/btrfs/Kconfig |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)
fs/Kconfig +0 -13
index 6198082..ef81718 100644
@@ -51,19 +51,6 @@ source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 source "fs/ocfs2/Kconfig"
 source "fs/btrfs/Kconfig"
-
-config BTRFS_FS_POSIX_ACL
-	bool "Btrfs POSIX Access Control Lists"
-	select FS_POSIX_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
-
 endif # BLOCK
 
 source "fs/notify/Kconfig"
fs/btrfs/Kconfig +15 -0
index f8fcf99..42e91e3 100644
@@ -16,3 +16,18 @@ config BTRFS_FS
 	  module will be called btrfs.
 
 	  If unsure, say N.
+
+config BTRFS_FS_POSIX_ACL
+	bool "Btrfs POSIX Access Control Lists"
+	depends on BTRFS_FS
+	select FS_POSIX_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
+
+
Signature · 1 line
1.6.0.2
#1 lore raw
Quoted 6 lines · Jeff Mahoney

Commit 699b6faa2ab283219914501d5117f8a93c7e441b allowed btrfs ACLs to
be selectable, but put the option in the main fs/Kconfig, and didn't make it depend on btrfs.

This patch moves the option and adds the dependency.

FYI, I did merge this but folded it into the original ACL patch. I rebased the tree because Yan found a bug that could cause corruption during btrfs-vol -b processing.

So, if you've pulled the unstable tree, you'll want to pull again and git gc

-chris