提交 1ebf2178 编写于 作者: H Harshad Shirwadkar 提交者: Theodore Ts'o

ext4: inline data inode fast commit replay fixes

Since there are no blocks in an inline data inode, there's no point in
fixing iblocks field in fast commit replay path for this inode.
Similarly, there's no point in fixing any block bitmaps / global block
counters with respect to such an inode. Just bail out from these
functions if an inline data inode is encountered.
Signed-off-by: NHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Link: https://lore.kernel.org/r/20211015182513.395917-2-harshads@google.comSigned-off-by: NTheodore Ts'o <tytso@mit.edu>
上级 6c31a689
...@@ -6071,6 +6071,9 @@ int ext4_ext_clear_bb(struct inode *inode) ...@@ -6071,6 +6071,9 @@ int ext4_ext_clear_bb(struct inode *inode)
int j, ret = 0; int j, ret = 0;
struct ext4_map_blocks map; struct ext4_map_blocks map;
if (ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA))
return 0;
/* Determin the size of the file first */ /* Determin the size of the file first */
path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL, path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL,
EXT4_EX_NOCACHE); EXT4_EX_NOCACHE);
......
...@@ -1526,7 +1526,8 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl, ...@@ -1526,7 +1526,8 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl,
* crashing. This should be fixed but until then, we calculate * crashing. This should be fixed but until then, we calculate
* the number of blocks the inode. * the number of blocks the inode.
*/ */
ext4_ext_replay_set_iblocks(inode); if (!ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA))
ext4_ext_replay_set_iblocks(inode);
inode->i_generation = le32_to_cpu(ext4_raw_inode(&iloc)->i_generation); inode->i_generation = le32_to_cpu(ext4_raw_inode(&iloc)->i_generation);
ext4_reset_inode_seed(inode); ext4_reset_inode_seed(inode);
...@@ -1844,6 +1845,10 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb) ...@@ -1844,6 +1845,10 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb)
} }
cur = 0; cur = 0;
end = EXT_MAX_BLOCKS; end = EXT_MAX_BLOCKS;
if (ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA)) {
iput(inode);
continue;
}
while (cur < end) { while (cur < end) {
map.m_lblk = cur; map.m_lblk = cur;
map.m_len = end - cur; map.m_len = end - cur;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册