Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: no need return value in restore summary process

No need return value in restore summary process

Signed-off-by: Yunlei He <heyunlei@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Yunlei He and committed by
Jaegeuk Kim
c376fc0f fab2adee

+5 -14
+1 -1
fs/f2fs/f2fs.h
··· 2627 2627 void recover_inline_xattr(struct inode *inode, struct page *page); 2628 2628 int recover_xattr_data(struct inode *inode, struct page *page); 2629 2629 int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page); 2630 - int restore_node_summary(struct f2fs_sb_info *sbi, 2630 + void restore_node_summary(struct f2fs_sb_info *sbi, 2631 2631 unsigned int segno, struct f2fs_summary_block *sum); 2632 2632 void flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc); 2633 2633 int build_node_manager(struct f2fs_sb_info *sbi);
+1 -2
fs/f2fs/node.c
··· 2325 2325 return 0; 2326 2326 } 2327 2327 2328 - int restore_node_summary(struct f2fs_sb_info *sbi, 2328 + void restore_node_summary(struct f2fs_sb_info *sbi, 2329 2329 unsigned int segno, struct f2fs_summary_block *sum) 2330 2330 { 2331 2331 struct f2fs_node *rn; ··· 2358 2358 invalidate_mapping_pages(META_MAPPING(sbi), addr, 2359 2359 addr + nrpages); 2360 2360 } 2361 - return 0; 2362 2361 } 2363 2362 2364 2363 static void remove_nats_in_journal(struct f2fs_sb_info *sbi)
+3 -11
fs/f2fs/segment.c
··· 2823 2823 } 2824 2824 } 2825 2825 2826 - static int read_compacted_summaries(struct f2fs_sb_info *sbi) 2826 + static void read_compacted_summaries(struct f2fs_sb_info *sbi) 2827 2827 { 2828 2828 struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); 2829 2829 struct curseg_info *seg_i; ··· 2880 2880 } 2881 2881 } 2882 2882 f2fs_put_page(page, 1); 2883 - return 0; 2884 2883 } 2885 2884 2886 2885 static int read_normal_summaries(struct f2fs_sb_info *sbi, int type) ··· 2925 2926 ns->ofs_in_node = 0; 2926 2927 } 2927 2928 } else { 2928 - int err; 2929 - 2930 - err = restore_node_summary(sbi, segno, sum); 2931 - if (err) { 2932 - f2fs_put_page(new, 1); 2933 - return err; 2934 - } 2929 + restore_node_summary(sbi, segno, sum); 2935 2930 } 2936 2931 } 2937 2932 ··· 2964 2971 META_CP, true); 2965 2972 2966 2973 /* restore for compacted data summary */ 2967 - if (read_compacted_summaries(sbi)) 2968 - return -EINVAL; 2974 + read_compacted_summaries(sbi); 2969 2975 type = CURSEG_HOT_NODE; 2970 2976 } 2971 2977