diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 16:35:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 16:35:17 +0200 |
| commit | 3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7 (patch) | |
| tree | 2fed11327a86c05ec945c31aa6e1307fbca527c9 /fs/ext3/inode.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | quota: Don't write quota info in dquot_commit() (diff) | |
| download | linux-3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7.tar.xz linux-3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7.zip | |
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:
quota: Don't write quota info in dquot_commit()
ext3: Fix writepage credits computation for ordered mode
Diffstat (limited to 'fs/ext3/inode.c')
| -rw-r--r-- | fs/ext3/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index b5c2f3c97d71..68b2e43d7c35 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -3291,7 +3291,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode) if (ext3_should_journal_data(inode)) ret = 3 * (bpp + indirects) + 2; else - ret = 2 * (bpp + indirects) + 2; + ret = 2 * (bpp + indirects) + indirects + 2; #ifdef CONFIG_QUOTA /* We know that structure was already allocated during dquot_initialize so |