diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 16:10:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 16:10:29 -0700 |
| commit | 3280fb313911a80b13de52d9fe37f39668f2138e (patch) | |
| tree | 6903a275ab00172a88cf51ab1d570e4a3e1a286b /Documentation | |
| parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
| parent | f319fb8bf6899e08bdb8d1e09a4e7a129dfa2312 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix kconfig typo and extra whitespace
ext4: fix build failure without procfs
ext4: add an option to control error handling on file data
jbd2: don't dirty original metadata buffer on abort
ext4: add checks for errors from jbd2
jbd2: fix error handling for checkpoint io
jbd2: abort when failed to log metadata buffers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/ext4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt index 74484e696405..eb154ef36c2a 100644 --- a/Documentation/filesystems/ext4.txt +++ b/Documentation/filesystems/ext4.txt @@ -223,6 +223,11 @@ errors=remount-ro(*) Remount the filesystem read-only on an error. errors=continue Keep going on a filesystem error. errors=panic Panic and halt the machine if an error occurs. +data_err=ignore(*) Just print an error message if an error occurs + in a file data buffer in ordered mode. +data_err=abort Abort the journal if an error occurs in a file + data buffer in ordered mode. + grpid Give objects the same group ID as their creator. bsdgroups |