summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/inode.c
diff options
context:
space:
mode:
authorYangtao Li <frank.li@vivo.com>2022-12-21 02:39:04 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2023-01-11 11:15:19 -0800
commitc40e15a9a59f79e79d9500f1fd019321ec35b959 (patch)
tree89dc3711f16003ff6e0724ed84cec867d0424d5d /fs/f2fs/inode.c
parent1cd7565449de6e838ff5a3fa75fbd2ce58c6d955 (diff)
downloadlinux-stable-c40e15a9a59f79e79d9500f1fd019321ec35b959.tar.gz
linux-stable-c40e15a9a59f79e79d9500f1fd019321ec35b959.tar.bz2
linux-stable-c40e15a9a59f79e79d9500f1fd019321ec35b959.zip
f2fs: merge f2fs_show_injection_info() into time_to_inject()
There is no need to additionally use f2fs_show_injection_info() to output information. Concatenate time_to_inject() and __time_to_inject() via a macro. In the new __time_to_inject() function, pass in the caller function name and parent function. In this way, we no longer need the f2fs_show_injection_info() function, and let's remove it. Suggested-by: Chao Yu <chao@kernel.org> Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/inode.c')
-rw-r--r--fs/f2fs/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index ff6cf66ed46b..01b9e6f85f6b 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -809,10 +809,8 @@ retry:
if (F2FS_HAS_BLOCKS(inode))
err = f2fs_truncate(inode);
- if (time_to_inject(sbi, FAULT_EVICT_INODE)) {
- f2fs_show_injection_info(sbi, FAULT_EVICT_INODE);
+ if (time_to_inject(sbi, FAULT_EVICT_INODE))
err = -EIO;
- }
if (!err) {
f2fs_lock_op(sbi);