diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-26 10:40:37 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-26 10:40:37 +1000 |
commit | 35fcedee7cbd5cb17564677aa3f18b0a42f65658 (patch) | |
tree | 85f5d428462f5568b9760e7fc7c5d34fa91b0499 | |
parent | ef95227d75f2f3a4bcb69d065bd3456d9bf9549f (diff) | |
parent | 89a8505ae82dbb64c703f9b6a2c81626b0d67833 (diff) |
Merge remote branch 'ext3/for_next'
-rw-r--r-- | fs/quota/Kconfig | 4 | ||||
-rw-r--r-- | fs/xfs/Kconfig | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig index 3e21b1e2ad3a..880fd9884366 100644 --- 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 480f28127f09..6100ec0fa1d4 100644 --- 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 |