summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChao Yu <yuchao0@huawei.com>2018-08-06 20:30:18 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2018-09-18 14:42:39 -0700
commit783a75765aad650efef729b9b26b7ffeea7af5fe (patch)
treeacce1f535caa3ebb072ed307f4f1117894fdc4ea
parent7f67de2a4cddd895dbd3583a1e43b90a3424b133 (diff)
f2fs: support discard submission error injection
This patch adds to support discard submission error injection for testing error handling of __submit_discard_cmd(). Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/f2fs.h1
-rw-r--r--fs/f2fs/segment.c8
-rw-r--r--fs/f2fs/super.c1
3 files changed, 10 insertions, 0 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 132dbba9e5e1..926ba2fd2680 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -58,6 +58,7 @@ enum {
FAULT_TRUNCATE,
FAULT_IO,
FAULT_CHECKPOINT,
+ FAULT_DISCARD,
FAULT_MAX,
};
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 4914b76823c9..17b6fcacca19 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1122,10 +1122,18 @@ static void __submit_discard_cmd(struct f2fs_sb_info *sbi,
dc->len += len;
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+ if (time_to_inject(sbi, FAULT_DISCARD)) {
+ f2fs_show_injection_info(FAULT_DISCARD);
+ err = -EIO;
+ goto submit;
+ }
+#endif
err = __blkdev_issue_discard(bdev,
SECTOR_FROM_BLOCK(start),
SECTOR_FROM_BLOCK(len),
GFP_NOFS, 0, &bio);
+submit:
if (!err && bio) {
/*
* should keep before submission to avoid D_DONE
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 59e20a6b6bd9..5511fa92b917 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -55,6 +55,7 @@ char *f2fs_fault_name[FAULT_MAX] = {
[FAULT_TRUNCATE] = "truncate fail",
[FAULT_IO] = "IO error",
[FAULT_CHECKPOINT] = "checkpoint error",
+ [FAULT_DISCARD] = "discard error",
};
void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate)