diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /fs/ext4/inode.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 6702a49992a6..98d3fe7057ef 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2498,7 +2498,7 @@ static int ext4_nonda_switch(struct super_block *sb) | |||
| 2498 | /* | 2498 | /* |
| 2499 | * switch to non delalloc mode if we are running low | 2499 | * switch to non delalloc mode if we are running low |
| 2500 | * on free block. The free block accounting via percpu | 2500 | * on free block. The free block accounting via percpu |
| 2501 | * counters can get slightly wrong with FBC_BATCH getting | 2501 | * counters can get slightly wrong with percpu_counter_batch getting |
| 2502 | * accumulated on each CPU without updating global counters | 2502 | * accumulated on each CPU without updating global counters |
| 2503 | * Delalloc need an accurate free block accounting. So switch | 2503 | * Delalloc need an accurate free block accounting. So switch |
| 2504 | * to non delalloc when we are near to error range. | 2504 | * to non delalloc when we are near to error range. |