Skip to content

Commit

Permalink
staging: erofs: kill CONFIG_EROFS_FS_IO_MAX_RETRIES
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gao Xiang authored and Greg Kroah-Hartman committed Aug 2, 2019
1 parent 22ee134 commit beb5f3c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/erofs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions drivers/staging/erofs/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit beb5f3c

Please sign in to comment.