diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 15:57:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 15:57:07 -0400 |
commit | 90e0c225968f0878e090c7ff3f88323973476cee (patch) | |
tree | 30fff5a5cb18b08d40e4d496489be6ce714a6cde /fs/ext3/Kconfig | |
parent | 938a73b959cf77aadc41bded3bf416b618aa20b3 (diff) | |
parent | 5f11e6a44059f728dddd8d0dbe5b4368ea93575b (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:
ext3: Fix dirtying of journalled buffers in data=journal mode
ext3: default to ordered mode
quota: Use mark_inode_dirty_sync instead of mark_inode_dirty
quota: Change quota error message to print out disk and function name
MAINTAINERS: Update entries of ext2 and ext3
MAINTAINERS: Update address of Andreas Dilger
ext3: Avoid filesystem corruption after a crash under heavy delete load
ext3: remove vestiges of nobh support
ext3: Fix set but unused variables
quota: clean up quota active checks
quota: Clean up the namespace in dqblk_xfs.h
quota: check quota reservation on remove_dquot_ref
Diffstat (limited to 'fs/ext3/Kconfig')
-rw-r--r-- | fs/ext3/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext3/Kconfig b/fs/ext3/Kconfig index 522b15498f4..e8c6ba0e4a3 100644 --- a/fs/ext3/Kconfig +++ b/fs/ext3/Kconfig | |||
@@ -31,6 +31,7 @@ config EXT3_FS | |||
31 | config EXT3_DEFAULTS_TO_ORDERED | 31 | config EXT3_DEFAULTS_TO_ORDERED |
32 | bool "Default to 'data=ordered' in ext3" | 32 | bool "Default to 'data=ordered' in ext3" |
33 | depends on EXT3_FS | 33 | depends on EXT3_FS |
34 | default y | ||
34 | help | 35 | help |
35 | The journal mode options for ext3 have different tradeoffs | 36 | The journal mode options for ext3 have different tradeoffs |
36 | between when data is guaranteed to be on disk and | 37 | between when data is guaranteed to be on disk and |