diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 10:35:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 10:35:17 -0400 |
| commit | 3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7 (patch) | |
| tree | 2fed11327a86c05ec945c31aa6e1307fbca527c9 /fs/ext3/inode.c | |
| parent | 0c3efe54d0165cecf0698b468e253577b555dde6 (diff) | |
| parent | b03f24567ce7caf2420b8be4c6eb74c191d59a91 (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:
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) | |||
| 3291 | if (ext3_should_journal_data(inode)) | 3291 | if (ext3_should_journal_data(inode)) |
| 3292 | ret = 3 * (bpp + indirects) + 2; | 3292 | ret = 3 * (bpp + indirects) + 2; |
| 3293 | else | 3293 | else |
| 3294 | ret = 2 * (bpp + indirects) + 2; | 3294 | ret = 2 * (bpp + indirects) + indirects + 2; |
| 3295 | 3295 | ||
| 3296 | #ifdef CONFIG_QUOTA | 3296 | #ifdef CONFIG_QUOTA |
| 3297 | /* We know that structure was already allocated during dquot_initialize so | 3297 | /* We know that structure was already allocated during dquot_initialize so |