Skip to content

Commit 7a127c8

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: rename FAULT_TIMEOUT to FAULT_ATOMIC_TIMEOUT
No logic changes. Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 6fa1160 commit 7a127c8

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ Description: Support configuring fault injection type, should be
741741
FAULT_BLKADDR_CONSISTENCE 0x00080000
742742
FAULT_NO_SEGMENT 0x00100000
743743
FAULT_INCONSISTENT_FOOTER 0x00200000
744-
FAULT_TIMEOUT 0x00400000 (1000ms)
744+
FAULT_ATOMIC_TIMEOUT 0x00400000 (1000ms)
745745
FAULT_VMALLOC 0x00800000
746746
=========================== ==========
747747

Documentation/filesystems/f2fs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ fault_type=%d Support configuring fault injection type, should be
215215
FAULT_BLKADDR_CONSISTENCE 0x00080000
216216
FAULT_NO_SEGMENT 0x00100000
217217
FAULT_INCONSISTENT_FOOTER 0x00200000
218-
FAULT_TIMEOUT 0x00400000 (1000ms)
218+
FAULT_ATOMIC_TIMEOUT 0x00400000 (1000ms)
219219
FAULT_VMALLOC 0x00800000
220220
=========================== ==========
221221
mode=%s Control block allocation mode which supports "adaptive"

fs/f2fs/f2fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ enum {
6363
FAULT_BLKADDR_CONSISTENCE,
6464
FAULT_NO_SEGMENT,
6565
FAULT_INCONSISTENT_FOOTER,
66-
FAULT_TIMEOUT,
66+
FAULT_ATOMIC_TIMEOUT,
6767
FAULT_VMALLOC,
6868
FAULT_MAX,
6969
};

fs/f2fs/segment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int __f2fs_commit_atomic_write(struct inode *inode)
371371
}
372372

373373
out:
374-
if (time_to_inject(sbi, FAULT_TIMEOUT))
374+
if (time_to_inject(sbi, FAULT_ATOMIC_TIMEOUT))
375375
f2fs_io_schedule_timeout_killable(DEFAULT_FAULT_TIMEOUT);
376376

377377
if (ret) {

fs/f2fs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
6767
[FAULT_BLKADDR_CONSISTENCE] = "inconsistent blkaddr",
6868
[FAULT_NO_SEGMENT] = "no free segment",
6969
[FAULT_INCONSISTENT_FOOTER] = "inconsistent footer",
70-
[FAULT_TIMEOUT] = "timeout",
70+
[FAULT_ATOMIC_TIMEOUT] = "atomic timeout",
7171
[FAULT_VMALLOC] = "vmalloc",
7272
};
7373

0 commit comments

Comments
 (0)