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>

diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 648ddd0d59f6f64e49937e3324a9dca840d4cb16..de5a80124e04f27505a315ce6a934d5276491687 100644 (file)
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -741,7 +741,7 @@ Description:        Support configuring fault injection type, should be
                FAULT_BLKADDR_CONSISTENCE        0x00080000
                FAULT_NO_SEGMENT                 0x00100000
                FAULT_INCONSISTENT_FOOTER        0x00200000
-               FAULT_TIMEOUT                    0x00400000 (1000ms)
+               FAULT_ATOMIC_TIMEOUT             0x00400000 (1000ms)
                FAULT_VMALLOC                    0x00800000
                ===========================      ==========
 

diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
index 9b3b835a174eb46058fafdf1010aaf66912b94eb..2d71efa7db7a0438087a7a024b5ff661cbd3353d 100644 (file)
--- a/Documentation/filesystems/f2fs.rst
+++ b/Documentation/filesystems/f2fs.rst
@@ -215,7 +215,7 @@ fault_type=%d                Support configuring fault injection type, should be
                             FAULT_BLKADDR_CONSISTENCE        0x00080000
                             FAULT_NO_SEGMENT                 0x00100000
                             FAULT_INCONSISTENT_FOOTER        0x00200000
-                            FAULT_TIMEOUT                    0x00400000 (1000ms)
+                            FAULT_ATOMIC_TIMEOUT             0x00400000 (1000ms)
                             FAULT_VMALLOC                    0x00800000
                             ===========================      ==========
 mode=%s                         Control block allocation mode which supports "adaptive"

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 95b7a8e3669cf16672291899ba347f93a8f9b811..533440f15e20b56cf14b48af9ccb5e26729f9bf3 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -63,7 +63,7 @@ enum {
        FAULT_BLKADDR_CONSISTENCE,
        FAULT_NO_SEGMENT,
        FAULT_INCONSISTENT_FOOTER,
-       FAULT_TIMEOUT,
+       FAULT_ATOMIC_TIMEOUT,
        FAULT_VMALLOC,
        FAULT_MAX,
 };

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 776b0df828ed7c631417f9b2d519a3607170e666..469d37c37398ab2595d4619fc8ef81571247b815 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -371,7 +371,7 @@ next:
        }
 
 out:
-       if (time_to_inject(sbi, FAULT_TIMEOUT))
+       if (time_to_inject(sbi, FAULT_ATOMIC_TIMEOUT))
                f2fs_io_schedule_timeout_killable(DEFAULT_FAULT_TIMEOUT);
 
        if (ret) {

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index be01eacbe5fa5a834ae2331c1695b6da183ff09f..1b7fc2bd3bb78b34911e3659d0665f247058cb9e 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -67,7 +67,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
        [FAULT_BLKADDR_CONSISTENCE]     = "inconsistent blkaddr",
        [FAULT_NO_SEGMENT]              = "no free segment",
        [FAULT_INCONSISTENT_FOOTER]     = "inconsistent footer",
-       [FAULT_TIMEOUT]                 = "timeout",
+       [FAULT_ATOMIC_TIMEOUT]          = "atomic timeout",
        [FAULT_VMALLOC]                 = "vmalloc",
 };