Commit 5b41395f authored by Yongqiang Yang's avatar Yongqiang Yang Committed by Theodore Ts'o

ext4: fix credits computing for indirect mapped files

When writing a contiguous set of blocks, two indirect blocks could be
needed depending on how the blocks are aligned, so we need to increase
the number of credits needed by one.

[ Also fixed a another bug which could further underestimate the
  number of journal credits needed by 1; the code was using integer
  division instead of DIV_ROUND_UP() -- tytso]
Signed-off-by: default avatarYongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
parent 21f97697
...@@ -5398,13 +5398,12 @@ static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks, ...@@ -5398,13 +5398,12 @@ static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks,
/* if nrblocks are contiguous */ /* if nrblocks are contiguous */
if (chunk) { if (chunk) {
/* /*
* With N contiguous data blocks, it need at most * With N contiguous data blocks, we need at most
* N/EXT4_ADDR_PER_BLOCK(inode->i_sb) indirect blocks * N/EXT4_ADDR_PER_BLOCK(inode->i_sb) + 1 indirect blocks,
* 2 dindirect blocks * 2 dindirect blocks, and 1 tindirect block
* 1 tindirect block
*/ */
indirects = nrblocks / EXT4_ADDR_PER_BLOCK(inode->i_sb); return DIV_ROUND_UP(nrblocks,
return indirects + 3; EXT4_ADDR_PER_BLOCK(inode->i_sb)) + 4;
} }
/* /*
* if nrblocks are not contiguous, worse case, each block touch * if nrblocks are not contiguous, worse case, each block touch
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment