Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 625f066c authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

f2fs: no need return value in restore summary process 



No need return value in restore summary process

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent f76c831a

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2627,7 +2627,7 @@ int try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink); 
void recover_inline_xattr(struct inode *inode, struct page *page);

int recover_xattr_data(struct inode *inode, struct page *page);

int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);

int restore_node_summary(struct f2fs_sb_info *sbi,

void restore_node_summary(struct f2fs_sb_info *sbi,

			unsigned int segno, struct f2fs_summary_block *sum);

void flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);

int build_node_manager(struct f2fs_sb_info *sbi);

fs/f2fs/node.c

+1 −2
Original line number Diff line number Diff line
@@ -2344,7 +2344,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) 
	return 0;

}



int restore_node_summary(struct f2fs_sb_info *sbi,

void restore_node_summary(struct f2fs_sb_info *sbi,

			unsigned int segno, struct f2fs_summary_block *sum)

{

	struct f2fs_node *rn;
@@ -2377,7 +2377,6 @@ int restore_node_summary(struct f2fs_sb_info *sbi, 
		invalidate_mapping_pages(META_MAPPING(sbi), addr,

							addr + nrpages);

	}

	return 0;

}



static void remove_nats_in_journal(struct f2fs_sb_info *sbi)

fs/f2fs/segment.c

+3 −11
Original line number Diff line number Diff line
@@ -2823,7 +2823,7 @@ void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr) 
	}

}



static int read_compacted_summaries(struct f2fs_sb_info *sbi)

static void read_compacted_summaries(struct f2fs_sb_info *sbi)

{

	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);

	struct curseg_info *seg_i;
@@ -2880,7 +2880,6 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) 
		}

	}

	f2fs_put_page(page, 1);

	return 0;

}



static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)
@@ -2926,13 +2925,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type) 
				ns->ofs_in_node = 0;

			}

		} else {

			int err;



			err = restore_node_summary(sbi, segno, sum);

			if (err) {

				f2fs_put_page(new, 1);

				return err;

			}

			restore_node_summary(sbi, segno, sum);

		}

	}
@@ -2971,8 +2964,7 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi) 
							META_CP, true);



		/* restore for compacted data summary */

		if (read_compacted_summaries(sbi))

			return -EINVAL;

		read_compacted_summaries(sbi);

		type = CURSEG_HOT_NODE;

	}