f2fs: clean up error handling in sanity_check_{compress_,}inode()
Chao Yu
maintainerPATCH 1/3 f2fs: clean up error handling in sanity_check_{compress_,}inode()
In sanity_check_{compress_,}inode(), it doesn't need to set SBI_NEED_FSCK in each error case, instead, we can set the flag in do_read_inode() only once when sanity_check_inode() fails.
--- fs/f2fs/inode.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
fs/f2fs/inode.c +4 -19
@@ -214,7 +214,7 @@ static bool sanity_check_compress_inode(struct inode *inode,f2fs_warn (sbi,"%s: inode (ino=%lx) has unsupported compress algorithm: %u, run fsck to fix" , __func__, inode->i_ino, ri->i_compress_algorithm); - goto err; +return false; }if (le64_to_cpu (ri->i_compr_blocks) >SECTOR_TO_BLOCK (inode->i_blocks)) {
@@ -222,14 +222,14 @@ static bool sanity_check_compress_inode(struct inode *inode,"%s: inode (ino=%lx) has inconsistent i_compr_blocks:%llu, i_blocks:%llu, run fsck to fix" , __func__, inode->i_ino,le64_to_cpu (ri->i_compr_blocks), SECTOR_TO_BLOCK(inode->i_blocks)); - goto err; +return false; }if (ri->i_log_cluster_size <MIN_COMPRESS_LOG_SIZE || ri->i_log_cluster_size >MAX_COMPRESS_LOG_SIZE ) {f2fs_warn (sbi,"%s: inode (ino=%lx) has unsupported log cluster size: %u, run fsck to fix" , __func__, inode->i_ino, ri->i_log_cluster_size); - goto err; +return false; } clevel = le16_to_cpu(ri->i_compress_flag) >>
@@ -273,8 +273,6 @@ static bool sanity_check_compress_inode(struct inode *inode, err_level:f2fs_warn (sbi,"%s: inode (ino=%lx) has unsupported compress level: %u, run fsck to fix" , __func__, inode->i_ino, clevel); -err: -set_sbi_flag (sbi,SBI_NEED_FSCK );return false; }
@@ -287,14 +285,12 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) iblocks =le64_to_cpu (F2FS_INODE (node_page)->i_blocks);if (!iblocks) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode i_blocks i_ino=%lx iblocks=%llu, run fsck to fix." , __func__, inode->i_ino, iblocks);return false; }if (ino_of_node (node_page) !=nid_of_node (node_page)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode footer i_ino=%lx, ino,nid: [%u, %u] run fsck to fix." , __func__, inode->i_ino,ino_of_node (node_page),nid_of_node (node_page));
@@ -303,7 +299,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)if (f2fs_has_extra_attr (inode)) {if (!f2fs_sb_has_extra_attr (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx) is with extra_attr, but extra_attr feature is off" , __func__, inode->i_ino);return false;
@@ -311,7 +306,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)if (fi->i_extra_isize >F2FS_TOTAL_EXTRA_ATTR_SIZE || fi->i_extra_isize <F2FS_MIN_EXTRA_ATTR_SIZE || fi->i_extra_isize %sizeof (__le32)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx) has corrupted i_extra_isize: %d, max: %zu" , __func__, inode->i_ino, fi->i_extra_isize,F2FS_TOTAL_EXTRA_ATTR_SIZE );
@@ -321,7 +315,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) f2fs_has_inline_xattr(inode) && (!fi->i_inline_xattr_size || fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx) has corrupted i_inline_xattr_size: %d, max: %zu" , __func__, inode->i_ino, fi->i_inline_xattr_size,MAX_INLINE_XATTR_SIZE );
@@ -335,7 +328,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)return false; } }else if (f2fs_sb_has_flexible_inline_xattr (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, run fsck to fix." , __func__, inode->i_ino);return false;
@@ -343,31 +335,26 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)if (!f2fs_sb_has_extra_attr (sbi)) {if (f2fs_sb_has_project_quota (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix." , __func__, inode->i_ino,F2FS_FEATURE_PRJQUOTA );return false; }if (f2fs_sb_has_inode_chksum (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix." , __func__, inode->i_ino,F2FS_FEATURE_INODE_CHKSUM );return false; }if (f2fs_sb_has_flexible_inline_xattr (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix." , __func__, inode->i_ino,F2FS_FEATURE_FLEXIBLE_INLINE_XATTR );return false; }if (f2fs_sb_has_inode_crtime (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix." , __func__, inode->i_ino,F2FS_FEATURE_INODE_CRTIME );return false; }if (f2fs_sb_has_compression (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: corrupted inode ino=%lx, wrong feature flag: %u, run fsck to fix." , __func__, inode->i_ino,F2FS_FEATURE_COMPRESSION );return false;
@@ -375,21 +362,18 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) }if (f2fs_sanity_check_inline_data (inode)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix" , __func__, inode->i_ino, inode->i_mode);return false; }if (f2fs_has_inline_dentry (inode) && !S_ISDIR (inode->i_mode)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx, mode=%u) should not have inline_dentry, run fsck to fix" , __func__, inode->i_ino, inode->i_mode);return false; }if ((fi->i_flags &F2FS_CASEFOLD_FL ) && !f2fs_sb_has_casefold (sbi)) { -set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_warn (sbi,"%s: inode (ino=%lx) has casefold flag, but casefold feature is off" , __func__, inode->i_ino);return false;
@@ -477,6 +461,7 @@ static int do_read_inode(struct inode *inode)if (!sanity_check_inode (inode, node_page)) {f2fs_put_page (node_page,1 ); +set_sbi_flag (sbi,SBI_NEED_FSCK );f2fs_handle_error (sbi,ERROR_CORRUPTED_INODE );return -EFSCORRUPTED ; }
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 2/3 f2fs: fix error path of f2fs_submit_page_read()
In error path of f2fs_submit_page_read(), it missed to call iostat_update_and_unbind_ctx() and free bio_post_read_ctx, fix it.
--- fs/f2fs/data.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/data.c +3 -0
@@ -1167,6 +1167,9 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,f2fs_wait_on_block_writeback (inode, blkaddr);if (bio_add_page (bio, page,PAGE_SIZE ,0 ) <PAGE_SIZE ) { +iostat_update_and_unbind_ctx (bio); +if (bio->bi_private) +mempool_free (bio->bi_private, bio_post_read_ctx_pool);bio_put (bio);return -EFAULT ; }
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 3/3 f2fs: compress: fix to assign compress_level for lz4 correctly
In reply to Chao YuAfter remount, F2FS_OPTION().compress_level was assgin to LZ4HC_DEFAULT_CLEVEL incorrectly, result in lz4hc:9 was enabled, fix it.
1. mount /dev/vdb/dev/vdb on /mnt/f2fs type f2fs (...,compress_algorithm=lz4,compress_log_size=2,...)
2. mount -t f2fs -o remount,compress_log_size=3 /mnt/f2fs/
3. mount|grep f2fs/dev/vdb on /mnt/f2fs type f2fs (...,compress_algorithm=lz4:9,compress_log_size=3,...)
--- fs/f2fs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/super.c +1 -1
@@ -591,7 +591,7 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)unsigned int level;if (strlen (str) ==3 ) { -F2FS_OPTION (sbi).compress_level =LZ4HC_DEFAULT_CLEVEL ; +F2FS_OPTION (sbi).compress_level =0 ;return 0 ; }
Signature · 1 line
2.40.1
Re: [f2fs-dev] [PATCH 1/3] f2fs: clean up error handling in sanity_check_{compress_, }inode()
In reply to Chao YuThis series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 8 lines · On Mon, 21 Aug 2023 23:22:23 +0800 you wrote:
In sanity_check_{compress_,}inode(), it doesn't need to set
SBI_NEED_FSCKin each error case, instead, we can set the flag indo_read_inode()only once whensanity_check_inode()fails.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/inode.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
Here is the summary with links:
- [f2fs-dev,1/3] f2fs: clean up error handling in sanity_check_{compress_, }inode()
https://git.kernel.org/jaegeuk/f2fs/c/c98879498413 - [f2fs-dev,2/3] f2fs: fix error path of f2fs_submit_page_read() https://git.kernel.org/jaegeuk/f2fs/c/5118697f7215 - [f2fs-dev,3/3] f2fs: compress: fix to assign compress_level for lz4 correctly https://git.kernel.org/jaegeuk/f2fs/c/091a4dfbb1d3
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel