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

Commit f0c9cada authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: use is_valid_blkaddr to verify blkaddr for readability 



Export is_valid_blkaddr() and use it to replace some codes for readability.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 272e083f

fs/f2fs/checkpoint.c

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ struct page *get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
	return page;

}



static inline bool is_valid_blkaddr(struct f2fs_sb_info *sbi,

						block_t blkaddr, int type)

bool is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type)

{

	switch (type) {

	case META_NAT:

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,7 @@ void destroy_segment_manager_caches(void); 
 */

struct page *grab_meta_page(struct f2fs_sb_info *, pgoff_t);

struct page *get_meta_page(struct f2fs_sb_info *, pgoff_t);

bool is_valid_blkaddr(struct f2fs_sb_info *, block_t, int);

int ra_meta_pages(struct f2fs_sb_info *, block_t, int, int);

void ra_meta_pages_cond(struct f2fs_sb_info *, pgoff_t);

long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);

fs/f2fs/recovery.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) 
	while (1) {

		struct fsync_inode_entry *entry;



		if (blkaddr < MAIN_BLKADDR(sbi) || blkaddr >= MAX_BLKADDR(sbi))

		if (!is_valid_blkaddr(sbi, blkaddr, META_POR))

			return 0;



		page = get_meta_page(sbi, blkaddr);
@@ -396,7 +396,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, 
		dest = datablock_addr(page, dn.ofs_in_node);



		if (src != dest && dest != NEW_ADDR && dest != NULL_ADDR &&

			dest >= MAIN_BLKADDR(sbi) && dest < MAX_BLKADDR(sbi)) {

			is_valid_blkaddr(sbi, dest, META_POR)) {



			if (src == NULL_ADDR) {

				err = reserve_new_block(&dn);
@@ -454,7 +454,7 @@ static int recover_data(struct f2fs_sb_info *sbi, 
	while (1) {

		struct fsync_inode_entry *entry;



		if (blkaddr < MAIN_BLKADDR(sbi) || blkaddr >= MAX_BLKADDR(sbi))

		if (!is_valid_blkaddr(sbi, blkaddr, META_POR))

			break;



		ra_meta_pages_cond(sbi, blkaddr);