2020-12-07 11:03:54

by 刘邵华BTD

Subject: [PATCH 1/2] f2fs: convert to F2FS_*_INO macro

From: Yangtao Li <[email protected]>

Use F2FS_ROOT_INO, F2FS_NODE_INO and F2FS_META_INO macro
for better code readability.

Signed-off-by: Yangtao Li <[email protected]>
Signed-off-by: Shaohua Liu <[email protected]>
---
fs/f2fs/super.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 00eff2f51807..d3ccf89647df 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3071,9 +3071,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
sbi->total_node_count =
(le32_to_cpu(raw_super->segment_count_nat) / 2)
* sbi->blocks_per_seg * NAT_ENTRY_PER_BLOCK;
- sbi->root_ino_num = le32_to_cpu(raw_super->root_ino);
- sbi->node_ino_num = le32_to_cpu(raw_super->node_ino);
- sbi->meta_ino_num = le32_to_cpu(raw_super->meta_ino);
+ F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
+ F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
+ F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
sbi->cur_victim_sec = NULL_SECNO;
sbi->next_victim_seg[BG_GC] = NULL_SEGNO;
sbi->next_victim_seg[FG_GC] = NULL_SEGNO;
--
2.25.1

2020-12-07 11:05:10

by 刘邵华BTD

Subject: [PATCH 2/2] f2fs: don't check PAGE_SIZE again in sanity_check_raw_super()

From: Yangtao Li <[email protected]>

Many flash devices read and write a single IO based on a multiple
of 4KB, and we support only 4KB page cache size now.

Since we already check page size in init_f2fs_fs(), so remove page
size check in sanity_check_raw_super().

Signed-off-by: Yangtao Li <[email protected]>
Signed-off-by: Shaohua Liu <[email protected]>
---
fs/f2fs/super.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index d3ccf89647df..a39a81ab8dee 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2770,13 +2770,6 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,
}
}

- /* Currently, support only 4KB page cache size */
- if (F2FS_BLKSIZE != PAGE_SIZE) {
- f2fs_info(sbi, "Invalid page_cache_size (%lu), supports only 4KB",
- PAGE_SIZE);
- return -EFSCORRUPTED;
- }
-
/* Currently, support only 4KB block size */
blocksize = 1 << le32_to_cpu(raw_super->log_blocksize);
if (blocksize != F2FS_BLKSIZE) {
--
2.25.1

2020-12-07 15:08:38

by Chao Yu

Subject: Re: [PATCH 1/2] f2fs: convert to F2FS_*_INO macro

On 2020/12/7 18:59, liush wrote:
> From: Yangtao Li <[email protected]>
>
> Use F2FS_ROOT_INO, F2FS_NODE_INO and F2FS_META_INO macro
> for better code readability.
>
> Signed-off-by: Yangtao Li <[email protected]>
> Signed-off-by: Shaohua Liu <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,

2020-12-07 15:09:12

by Chao Yu

Subject: Re: [PATCH 2/2] f2fs: don't check PAGE_SIZE again in sanity_check_raw_super()

On 2020/12/7 18:59, liush wrote:
> From: Yangtao Li <[email protected]>
>
> Many flash devices read and write a single IO based on a multiple
> of 4KB, and we support only 4KB page cache size now.
>
> Since we already check page size in init_f2fs_fs(), so remove page
> size check in sanity_check_raw_super().
>
> Signed-off-by: Yangtao Li <[email protected]>
> Signed-off-by: Shaohua Liu <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,