diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 13:25:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 13:25:56 -0800 |
| commit | 1f11abc966b82b9fd0c834707486ef301b2f398d (patch) | |
| tree | 4e9d49b00ab034f1fc7f11cb1ff54e3121a728ae /Documentation | |
| parent | f8e9766dd1bacd5f32f9ac4322b55fbfd46b778e (diff) | |
| parent | 0637c6f4135f592f094207c7c21e7c0fc5557834 (diff) | |
| download | linux-1f11abc966b82b9fd0c834707486ef301b2f398d.tar.gz linux-1f11abc966b82b9fd0c834707486ef301b2f398d.tar.bz2 linux-1f11abc966b82b9fd0c834707486ef301b2f398d.zip | |
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: Patch up how we claim metadata blocks for quota purposes
ext4: Ensure zeroout blocks have no dirty metadata
ext4: return correct wbc.nr_to_write in ext4_da_writepages
ext4: Update documentation to correct the inode_readahead_blks option name
jbd2: don't use __GFP_NOFAIL in journal_init_common()
ext4: flush delalloc blocks when space is low
fs-writeback: Add helper function to start writeback if idle
ext4: Eliminate potential double free on error path
ext4: fix unsigned long long printk warning in super.c
ext4, jbd2: Add barriers for file systems with exernal journals
ext4: replace BUG() with return -EIO in ext4_ext_get_blocks
ext4: add module aliases for ext2 and ext3
ext4: Don't ask about supporting ext2/3 in ext4 if ext4 is not configured
ext4: remove unused #include <linux/version.h>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/ext4.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt index af6885c3c821..e1def1786e50 100644 --- a/Documentation/filesystems/ext4.txt +++ b/Documentation/filesystems/ext4.txt @@ -196,7 +196,7 @@ nobarrier This also requires an IO stack which can support also be used to enable or disable barriers, for consistency with other ext4 mount options. -inode_readahead=n This tuning parameter controls the maximum +inode_readahead_blks=n This tuning parameter controls the maximum number of inode table blocks that ext4's inode table readahead algorithm will pre-read into the buffer cache. The default value is 32 blocks. |