From: Jason Yan <yanaijie@huawei.com>
To: <tytso@mit.edu>, <adilger.kernel@dilger.ca>, <jack@suse.cz>,
<ritesh.list@gmail.com>, <lczerner@redhat.com>,
<linux-ext4@vger.kernel.org>
Cc: Jason Yan <yanaijie@huawei.com>
Subject: [PATCH v2 04/13] ext4: factor out ext4_handle_clustersize()
Date: Sat, 3 Sep 2022 11:01:47 +0800 [thread overview]
Message-ID: <20220903030156.770313-5-yanaijie@huawei.com> (raw)
In-Reply-To: <20220903030156.770313-1-yanaijie@huawei.com>
Factor out ext4_handle_clustersize(). No functional change.
Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
fs/ext4/super.c | 110 +++++++++++++++++++++++++++---------------------
1 file changed, 61 insertions(+), 49 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7cc499a221ff..09b3c51d472b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4366,6 +4366,64 @@ static void ext4_set_def_opts(struct super_block *sb,
set_opt(sb, DELALLOC);
}
+static int ext4_handle_clustersize(struct super_block *sb, int blocksize)
+{
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ struct ext4_super_block *es = sbi->s_es;
+ int clustersize;
+
+ /* Handle clustersize */
+ clustersize = BLOCK_SIZE << le32_to_cpu(es->s_log_cluster_size);
+ if (ext4_has_feature_bigalloc(sb)) {
+ if (clustersize < blocksize) {
+ ext4_msg(sb, KERN_ERR,
+ "cluster size (%d) smaller than "
+ "block size (%d)", clustersize, blocksize);
+ return -EINVAL;
+ }
+ sbi->s_cluster_bits = le32_to_cpu(es->s_log_cluster_size) -
+ le32_to_cpu(es->s_log_block_size);
+ sbi->s_clusters_per_group =
+ le32_to_cpu(es->s_clusters_per_group);
+ if (sbi->s_clusters_per_group > blocksize * 8) {
+ ext4_msg(sb, KERN_ERR,
+ "#clusters per group too big: %lu",
+ sbi->s_clusters_per_group);
+ return -EINVAL;
+ }
+ if (sbi->s_blocks_per_group !=
+ (sbi->s_clusters_per_group * (clustersize / blocksize))) {
+ ext4_msg(sb, KERN_ERR, "blocks per group (%lu) and "
+ "clusters per group (%lu) inconsistent",
+ sbi->s_blocks_per_group,
+ sbi->s_clusters_per_group);
+ return -EINVAL;
+ }
+ } else {
+ if (clustersize != blocksize) {
+ ext4_msg(sb, KERN_ERR,
+ "fragment/cluster size (%d) != "
+ "block size (%d)", clustersize, blocksize);
+ return -EINVAL;
+ }
+ if (sbi->s_blocks_per_group > blocksize * 8) {
+ ext4_msg(sb, KERN_ERR,
+ "#blocks per group too big: %lu",
+ sbi->s_blocks_per_group);
+ return -EINVAL;
+ }
+ sbi->s_clusters_per_group = sbi->s_blocks_per_group;
+ sbi->s_cluster_bits = 0;
+ }
+ sbi->s_cluster_ratio = clustersize / blocksize;
+
+ /* Do we have standard group size of clustersize * 8 blocks ? */
+ if (sbi->s_blocks_per_group == clustersize << 3)
+ set_opt2(sb, STD_GROUP_SIZE);
+
+ return 0;
+}
+
static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
{
struct buffer_head *bh, **group_desc;
@@ -4377,7 +4435,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
unsigned long offset = 0;
struct inode *root;
int ret = -ENOMEM;
- int blocksize, clustersize;
+ int blocksize;
unsigned int db_count;
unsigned int i;
int needs_recovery, has_huge_files;
@@ -4847,54 +4905,8 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
}
}
- /* Handle clustersize */
- clustersize = BLOCK_SIZE << le32_to_cpu(es->s_log_cluster_size);
- if (ext4_has_feature_bigalloc(sb)) {
- if (clustersize < blocksize) {
- ext4_msg(sb, KERN_ERR,
- "cluster size (%d) smaller than "
- "block size (%d)", clustersize, blocksize);
- goto failed_mount;
- }
- sbi->s_cluster_bits = le32_to_cpu(es->s_log_cluster_size) -
- le32_to_cpu(es->s_log_block_size);
- sbi->s_clusters_per_group =
- le32_to_cpu(es->s_clusters_per_group);
- if (sbi->s_clusters_per_group > blocksize * 8) {
- ext4_msg(sb, KERN_ERR,
- "#clusters per group too big: %lu",
- sbi->s_clusters_per_group);
- goto failed_mount;
- }
- if (sbi->s_blocks_per_group !=
- (sbi->s_clusters_per_group * (clustersize / blocksize))) {
- ext4_msg(sb, KERN_ERR, "blocks per group (%lu) and "
- "clusters per group (%lu) inconsistent",
- sbi->s_blocks_per_group,
- sbi->s_clusters_per_group);
- goto failed_mount;
- }
- } else {
- if (clustersize != blocksize) {
- ext4_msg(sb, KERN_ERR,
- "fragment/cluster size (%d) != "
- "block size (%d)", clustersize, blocksize);
- goto failed_mount;
- }
- if (sbi->s_blocks_per_group > blocksize * 8) {
- ext4_msg(sb, KERN_ERR,
- "#blocks per group too big: %lu",
- sbi->s_blocks_per_group);
- goto failed_mount;
- }
- sbi->s_clusters_per_group = sbi->s_blocks_per_group;
- sbi->s_cluster_bits = 0;
- }
- sbi->s_cluster_ratio = clustersize / blocksize;
-
- /* Do we have standard group size of clustersize * 8 blocks ? */
- if (sbi->s_blocks_per_group == clustersize << 3)
- set_opt2(sb, STD_GROUP_SIZE);
+ if (ext4_handle_clustersize(sb, blocksize))
+ goto failed_mount;
/*
* Test whether we have more sectors than will fit in sector_t,
--
2.31.1
next prev parent reply other threads:[~2022-09-03 2:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-03 3:01 [PATCH v2 00/13] some refactor of __ext4_fill_super() Jason Yan
2022-09-03 3:01 ` [PATCH v2 01/13] ext4: goto right label 'failed_mount3a' Jason Yan
2022-09-08 8:39 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 02/13] ext4: remove cantfind_ext4 error handler Jason Yan
2022-09-08 8:40 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 03/13] ext4: factor out ext4_set_def_opts() Jason Yan
2022-09-08 8:44 ` Ritesh Harjani (IBM)
2022-09-12 2:20 ` Jason Yan
2022-09-03 3:01 ` Jason Yan [this message]
2022-09-08 8:45 ` [PATCH v2 04/13] ext4: factor out ext4_handle_clustersize() Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 05/13] ext4: factor out ext4_fast_commit_init() Jason Yan
2022-09-08 8:45 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 06/13] ext4: factor out ext4_inode_info_init() Jason Yan
2022-09-08 8:46 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 07/13] ext4: factor out ext4_encoding_init() Jason Yan
2022-09-08 8:56 ` Ritesh Harjani (IBM)
2022-09-12 2:30 ` Jason Yan
2022-09-12 3:12 ` Jason Yan
2022-09-03 3:01 ` [PATCH v2 08/13] ext4: factor out ext4_init_metadata_csum() Jason Yan
2022-09-08 8:57 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 09/13] ext4: factor out ext4_check_feature_compatibility() Jason Yan
2022-09-08 8:58 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 10/13] ext4: factor out ext4_geometry_check() Jason Yan
2022-09-08 9:00 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 11/13] ext4: factor out ext4_group_desc_init() and ext4_group_desc_free() Jason Yan
2022-09-08 9:03 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 12/13] ext4: factor out ext4_load_and_init_journal() Jason Yan
2022-09-08 9:04 ` Ritesh Harjani (IBM)
2022-09-03 3:01 ` [PATCH v2 13/13] ext4: factor out ext4_journal_data_mode_check() Jason Yan
2022-09-08 9:06 ` Ritesh Harjani (IBM)
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=20220903030156.770313-5-yanaijie@huawei.com \
--to=yanaijie@huawei.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=ritesh.list@gmail.com \
--cc=tytso@mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.