Procházet zdrojové kódy

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>
Jan Kara před 15 roky
rodič
revize
80f44b152c
2 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 2 2
      fs/quota/Kconfig
  2. 1 0
      fs/xfs/Kconfig

+ 2 - 2
fs/quota/Kconfig

@@ -4,6 +4,7 @@
 
 
 config QUOTA
 config QUOTA
 	bool "Quota support"
 	bool "Quota support"
+	select QUOTACTL
 	help
 	help
 	  If you say Y here, you will be able to set per user limits for disk
 	  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
 	  usage (also called disk quotas). Currently, it works for the
@@ -65,8 +66,7 @@ config QFMT_V2
 
 
 config QUOTACTL
 config QUOTACTL
 	bool
 	bool
-	depends on XFS_QUOTA || QUOTA
-	default y
+	default n
 
 
 config QUOTACTL_COMPAT
 config QUOTACTL_COMPAT
 	bool
 	bool

+ 1 - 0
fs/xfs/Kconfig

@@ -22,6 +22,7 @@ config XFS_FS
 config XFS_QUOTA
 config XFS_QUOTA
 	bool "XFS Quota support"
 	bool "XFS Quota support"
 	depends on XFS_FS
 	depends on XFS_FS
+	select QUOTACTL
 	help
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
 	  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
 	  a per user and/or a per group basis under XFS.  XFS considers quota