Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1594699
| From | Jaegeuk Kim <jaegeuk@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/4] f2fs: fix wrong error injection for evict_inode |
| Date | 2017-03-07 23:30 +0100 |
| Message-ID | <tivMd-5FM-5@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
The previous one was not a proper location to inject an error, since there
is no point to get errors. Instead, we can emulate EIO during truncation,
and the below logic should handle it correctly.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/inode.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index ef8610bf950f..2520fa72b23f 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -372,13 +372,6 @@ void f2fs_evict_inode(struct inode *inode)
if (inode->i_nlink || is_bad_inode(inode))
goto no_delete;
-#ifdef CONFIG_F2FS_FAULT_INJECTION
- if (time_to_inject(sbi, FAULT_EVICT_INODE)) {
- f2fs_show_injection_info(FAULT_EVICT_INODE);
- goto no_delete;
- }
-#endif
-
remove_ino_entry(sbi, inode->i_ino, APPEND_INO);
remove_ino_entry(sbi, inode->i_ino, UPDATE_INO);
@@ -389,6 +382,12 @@ void f2fs_evict_inode(struct inode *inode)
if (F2FS_HAS_BLOCKS(inode))
err = f2fs_truncate(inode);
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+ if (time_to_inject(sbi, FAULT_EVICT_INODE)) {
+ f2fs_show_injection_info(FAULT_EVICT_INODE);
+ err = -EIO;
+ }
+#endif
if (!err) {
f2fs_lock_op(sbi);
err = remove_inode_page(inode);
--
2.11.0
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 1/4] f2fs: fix wrong error injection for evict_inode Jaegeuk Kim <jaegeuk@kernel.org> - 2017-03-07 23:30 +0100
[PATCH 2/4] f2fs: build stat_info before orphan inode recovery Jaegeuk Kim <jaegeuk@kernel.org> - 2017-03-07 23:30 +0100
Re: [f2fs-dev] [PATCH 2/4] f2fs: build stat_info before orphan inode recovery Chao Yu <yuchao0@huawei.com> - 2017-03-09 10:20 +0100
Re: [f2fs-dev] [PATCH 2/4] f2fs: build stat_info before orphan inode recovery Jaegeuk Kim <jaegeuk@kernel.org> - 2017-03-10 00:50 +0100
Re: [PATCH 2/4 v2] f2fs: build stat_info before orphan inode recovery Jaegeuk Kim <jaegeuk@kernel.org> - 2017-03-10 00:30 +0100
[PATCH 3/4] f2fs: show more precise message on orphan recovery failure Jaegeuk Kim <jaegeuk@kernel.org> - 2017-03-07 23:30 +0100
Re: [f2fs-dev] [PATCH 1/4] f2fs: fix wrong error injection for evict_inode Chao Yu <yuchao0@huawei.com> - 2017-03-09 10:00 +0100
csiph-web