quota: Make QUOTACTL config be selected by its users

Remove "depends on" line from QUOTACTL config option and rather select
the option explicitely from config options which need it. It makes more
sense this way and also fixes Kconfig warning due to GFS2 selecting
QUOTACTL but QUOTACTL not depending on it.

Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig
index 3e21b1e2ad3a7c63203c4bf6291ffb6f82907aba..880fd988436695344ff58134ff839382a8003689 100644 (file)
--- a/fs/quota/Kconfig
+++ b/fs/quota/Kconfig
@@ -4,6 +4,7 @@
 
 config QUOTA
        bool "Quota support"
+       select QUOTACTL
        help
          If you say Y here, you will be able to set per user limits for disk
          usage (also called disk quotas). Currently, it works for the
@@ -65,8 +66,7 @@ config QFMT_V2
 
 config QUOTACTL
        bool
-       depends on XFS_QUOTA || QUOTA
-       default y
+       default n
 
 config QUOTACTL_COMPAT
        bool

diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 480f28127f09f08f7d26577eec6eea7a09c68d5d..6100ec0fa1d453770f41db47e0402daea8271c64 100644 (file)
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -22,6 +22,7 @@ config XFS_FS
 config XFS_QUOTA
        bool "XFS Quota support"
        depends on XFS_FS
+       select QUOTACTL
        help
          If you say Y here, you will be able to set limits for disk usage on
          a per user and/or a per group basis under XFS.  XFS considers quota