diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 23:13:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 23:13:18 -0400 |
| commit | 7d2f280e75f05919314e250cadf361a327ed555c (patch) | |
| tree | 47db5a9a0ceaf31adf49c18b663b1e08184f7cff /fs/xfs | |
| parent | e3e1288e86a07cdeb0aee5860a2dff111c6eff79 (diff) | |
| parent | 4408ea41c0ab4b711d4da44dd954fb06dce6c3f8 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (24 commits)
quota: Fix possible oops in __dquot_initialize()
ext3: Update kernel-doc comments
jbd/2: fixed typos
ext2: fixed typo.
ext3: Fix debug messages in ext3_group_extend()
jbd: Convert atomic_inc() to get_bh()
ext3: Remove misplaced BUFFER_TRACE() in ext3_truncate()
jbd: Fix debug message in do_get_write_access()
jbd: Check return value of __getblk()
ext3: Use DIV_ROUND_UP() on group desc block counting
ext3: Return proper error code on ext3_fill_super()
ext3: Remove unnecessary casts on bh->b_data
ext3: Cleanup ext3_setup_super()
quota: Fix issuing of warnings from dquot_transfer
quota: fix dquot_disable vs dquot_transfer race v2
jbd: Convert bitops to buffer fns
ext3/jbd: Avoid WARN() messages when failing to write the superblock
jbd: Use offset_in_page() instead of manual calculation
jbd: Remove unnecessary goto statement
jbd: Use printk_ratelimited() in journal_alloc_journal_head()
...
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 | |||
| 22 | config XFS_QUOTA | 22 | config XFS_QUOTA |
| 23 | bool "XFS Quota support" | 23 | bool "XFS Quota support" |
| 24 | depends on XFS_FS | 24 | depends on XFS_FS |
| 25 | select QUOTACTL | ||
| 25 | help | 26 | help |
| 26 | If you say Y here, you will be able to set limits for disk usage on | 27 | If you say Y here, you will be able to set limits for disk usage on |
| 27 | a per user and/or a per group basis under XFS. XFS considers quota | 28 | a per user and/or a per group basis under XFS. XFS considers quota |