hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext4: lost matching-pair of trace in ext4_truncate 

It should call trace exit in all return path for ext4_truncate.

Signed-off-by: zhengliang <zhengliang6@huawei.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/20200701083027.45996-1-zhengliang6@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
zhengliang 2020-07-01 16:30:27 +08:00 committed by Theodore Ts'o
parent ef3f5830b8
commit 9a5d265fed
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ext4/inode.c
View File

@ -4163,7 +4163,7 @@ int ext4_truncate(struct inode *inode)
trace_ext4_truncate_enter(inode); trace_ext4_truncate_enter(inode);
if (!ext4_can_truncate(inode)) if (!ext4_can_truncate(inode))
return 0; goto out_trace;
if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC)) if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE); ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);
@ -4172,16 +4172,14 @@ int ext4_truncate(struct inode *inode)
int has_inline = 1; int has_inline = 1;
err = ext4_inline_data_truncate(inode, &has_inline); err = ext4_inline_data_truncate(inode, &has_inline);
if (err) if (err || has_inline)
return err; goto out_trace;
if (has_inline)
return 0;
} }
/* If we zero-out tail of the page, we have to create jinode for jbd2 */ /* If we zero-out tail of the page, we have to create jinode for jbd2 */
if (inode->i_size & (inode->i_sb->s_blocksize - 1)) { if (inode->i_size & (inode->i_sb->s_blocksize - 1)) {
if (ext4_inode_attach_jinode(inode) < 0) if (ext4_inode_attach_jinode(inode) < 0)
return 0; goto out_trace;
} }
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
@ -4190,8 +4188,10 @@ int ext4_truncate(struct inode *inode)
credits = ext4_blocks_for_truncate(inode); credits = ext4_blocks_for_truncate(inode);
handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits); handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);
if (IS_ERR(handle)) if (IS_ERR(handle)) {
return PTR_ERR(handle); err = PTR_ERR(handle);
goto out_trace;
}
if (inode->i_size & (inode->i_sb->s_blocksize - 1)) if (inode->i_size & (inode->i_sb->s_blocksize - 1))
ext4_block_truncate_page(handle, mapping, inode->i_size); ext4_block_truncate_page(handle, mapping, inode->i_size);
@ -4242,6 +4242,7 @@ out_stop:
err = err2; err = err2;
ext4_journal_stop(handle); ext4_journal_stop(handle);
out_trace:
trace_ext4_truncate_exit(inode); trace_ext4_truncate_exit(inode);
return err; return err;
} }