Commit beb5f3c4 authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman

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: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190731155752.210602-9-gaoxiang25@huawei.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22ee1347
...@@ -78,15 +78,6 @@ config EROFS_FAULT_INJECTION ...@@ -78,15 +78,6 @@ config EROFS_FAULT_INJECTION
Test EROFS to inject faults such as ENOMEM, EIO, and so on. Test EROFS to inject faults such as ENOMEM, EIO, and so on.
If unsure, say N. 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 config EROFS_FS_ZIP
bool "EROFS Data Compresssion Support" bool "EROFS Data Compresssion Support"
depends on EROFS_FS depends on EROFS_FS
......
...@@ -279,6 +279,8 @@ static inline void z_erofs_exit_zip_subsystem(void) {} ...@@ -279,6 +279,8 @@ static inline void z_erofs_exit_zip_subsystem(void) {}
#error erofs cannot be used in this platform #error erofs cannot be used in this platform
#endif #endif
#define EROFS_IO_MAX_RETRIES_NOFAIL 5
#define ROOT_NID(sb) ((sb)->root_nid) #define ROOT_NID(sb) ((sb)->root_nid)
#define erofs_blknr(addr) ((addr) / EROFS_BLKSIZ) #define erofs_blknr(addr) ((addr) / EROFS_BLKSIZ)
...@@ -467,12 +469,6 @@ static inline void __submit_bio(struct bio *bio, unsigned int op, ...@@ -467,12 +469,6 @@ static inline void __submit_bio(struct bio *bio, unsigned int op,
submit_bio(bio); 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, struct page *__erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr,
bool prio, bool nofail); bool prio, bool nofail);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment