staging: erofs: kill CONFIG_EROFS_FS_IO_MAX_RETRIES

CONFIG_EROFS_FS_IO_MAX_RETRIES seems a runtime setting
and users have no idea about the change in behaviour.

Let's remove the setting currently and could turn it
into a module parameter if it's really needed.

Suggested-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190731155752.210602-9-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
index 2577cbb46a5bbee00c061084573983560df1b377..747e9eebfaa569c5d5332bb62df3bb2df989212c 100644 (file)
--- a/drivers/staging/erofs/Kconfig
+++ b/drivers/staging/erofs/Kconfig
@@ -78,15 +78,6 @@ config EROFS_FAULT_INJECTION
          Test EROFS to inject faults such as ENOMEM, EIO, and so on.
          If unsure, say N.
 
-config EROFS_FS_IO_MAX_RETRIES
-       int "EROFS IO Maximum Retries"
-       depends on EROFS_FS
-       default "5"
-       help
-         Maximum retry count of IO Errors.
-
-         If unsure, leave the default value (5 retries, 6 IOs at most).
-
 config EROFS_FS_ZIP
        bool "EROFS Data Compresssion Support"
        depends on EROFS_FS

diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index 959bd0ae9d74da8bb8e8437178167edfc0761704..a3b9fcdd0c272525e13e3a5372b7583d48d95c87 100644 (file)
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -279,6 +279,8 @@ static inline void z_erofs_exit_zip_subsystem(void) {}
 #error erofs cannot be used in this platform
 #endif
 
+#define EROFS_IO_MAX_RETRIES_NOFAIL     5
+
 #define ROOT_NID(sb)           ((sb)->root_nid)
 
 #define erofs_blknr(addr)       ((addr) / EROFS_BLKSIZ)
@@ -467,12 +469,6 @@ static inline void __submit_bio(struct bio *bio, unsigned int op,
        submit_bio(bio);
 }
 
-#ifndef CONFIG_EROFS_FS_IO_MAX_RETRIES
-#define EROFS_IO_MAX_RETRIES_NOFAIL    0
-#else
-#define EROFS_IO_MAX_RETRIES_NOFAIL    CONFIG_EROFS_FS_IO_MAX_RETRIES
-#endif
-
 struct page *__erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr,
                                   bool prio, bool nofail);