From: Gao Xiang <gaoxiang25@huawei.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Chao Yu <yuchao0@huawei.com>, <devel@driverdev.osuosl.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
<linux-erofs@lists.ozlabs.org>, "Chao Yu" <chao@kernel.org>,
Miao Xie <miaoxie@huawei.com>, <weidu.du@huawei.com>,
Fang Wei <fangwei1@huawei.com>, Gao Xiang <gaoxiang25@huawei.com>
Subject: [PATCH v2 08/22] staging: erofs: kill CONFIG_EROFS_FS_IO_MAX_RETRIES
Date: Wed, 31 Jul 2019 23:57:38 +0800 [thread overview]
Message-ID: <20190731155752.210602-9-gaoxiang25@huawei.com> (raw)
In-Reply-To: <20190731155752.210602-1-gaoxiang25@huawei.com>
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>
---
drivers/staging/erofs/Kconfig | 9 ---------
drivers/staging/erofs/internal.h | 8 ++------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
index 2577cbb46a5b..747e9eebfaa5 100644
--- 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 959bd0ae9d74..a3b9fcdd0c27 100644
--- 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);
--
2.17.1
next prev parent reply other threads:[~2019-07-31 15:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 15:57 [PATCH v2 00/22] staging: erofs: updates according to erofs-outofstaging v4 Gao Xiang
2019-07-31 15:57 ` [PATCH v2 01/22] staging: erofs: update source file headers Gao Xiang
2019-07-31 15:57 ` [PATCH v2 02/22] staging: erofs: rename source files for better understanding Gao Xiang
2019-07-31 15:57 ` [PATCH v2 03/22] staging: erofs: fix dummy functions erofs_{get,list}xattr Gao Xiang
2019-07-31 15:57 ` [PATCH v2 04/22] staging: erofs: keep up erofs_fs.h with erofs-outofstaging patchset Gao Xiang
2019-07-31 15:57 ` [PATCH v2 05/22] staging: erofs: sunset erofs_workstn_{lock,unlock} Gao Xiang
2019-07-31 15:57 ` [PATCH v2 06/22] staging: erofs: clean up internal.h Gao Xiang
2019-07-31 15:57 ` [PATCH v2 07/22] staging: erofs: remove redundant #include "internal.h" Gao Xiang
2019-08-01 1:32 ` Chao Yu
2019-07-31 15:57 ` Gao Xiang [this message]
2019-08-01 1:33 ` [PATCH v2 08/22] staging: erofs: kill CONFIG_EROFS_FS_IO_MAX_RETRIES Chao Yu
2019-07-31 15:57 ` [PATCH v2 09/22] staging: erofs: clean up shrinker stuffs Gao Xiang
2019-07-31 15:57 ` [PATCH v2 10/22] staging: erofs: kill sbi->dev_name Gao Xiang
2019-07-31 15:57 ` [PATCH v2 11/22] staging: erofs: kill all failure handling in fill_super() Gao Xiang
2019-07-31 15:57 ` [PATCH v2 12/22] staging: erofs: drop __GFP_NOFAIL for managed inode Gao Xiang
2019-08-01 1:39 ` Chao Yu
2019-07-31 15:57 ` [PATCH v2 13/22] staging: erofs: refine erofs_allocpage() Gao Xiang
2019-07-31 15:57 ` [PATCH v2 14/22] staging: erofs: kill CONFIG_EROFS_FS_USE_VM_MAP_RAM Gao Xiang
2019-07-31 15:57 ` [PATCH v2 15/22] staging: erofs: tidy up zpvec.h Gao Xiang
2019-07-31 15:57 ` [PATCH v2 16/22] staging: erofs: remove redundant braces in inode.c Gao Xiang
2019-07-31 15:57 ` [PATCH v2 17/22] staging: erofs: tidy up decompression frontend Gao Xiang
2019-07-31 15:57 ` [PATCH v2 18/22] staging: erofs: remove clusterbits in sbi Gao Xiang
2019-07-31 15:57 ` [PATCH v2 19/22] staging: erofs: turn cache strategies into mount options Gao Xiang
2019-07-31 15:57 ` [PATCH v2 20/22] staging: erofs: tidy up utils.c Gao Xiang
2019-07-31 15:57 ` [PATCH v2 21/22] staging: erofs: update super.c Gao Xiang
2019-07-31 15:57 ` [PATCH v2 22/22] staging: erofs: update Kconfig Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190731155752.210602-9-gaoxiang25@huawei.com \
--to=gaoxiang25@huawei.com \
--cc=chao@kernel.org \
--cc=devel@driverdev.osuosl.org \
--cc=fangwei1@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miaoxie@huawei.com \
--cc=weidu.du@huawei.com \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).