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

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

f2fs: convert recover_orphan_inodes to void 



The recover_orphan_inodes() returns no error all the time, so we don't need to
check its errors.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
[Jaegeuk Kim: add description]
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 1069bbf7

fs/f2fs/checkpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -271,12 +271,12 @@ static void recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 
	iput(inode);

}



int recover_orphan_inodes(struct f2fs_sb_info *sbi)

void recover_orphan_inodes(struct f2fs_sb_info *sbi)

{

	block_t start_blk, orphan_blkaddr, i, j;



	if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG))

		return 0;

		return;



	sbi->por_doing = true;

	start_blk = __start_cp_addr(sbi) + 1;
@@ -296,7 +296,7 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi) 
	/* clear Orphan Flag */

	clear_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG);

	sbi->por_doing = false;

	return 0;

	return;

}



static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *); 
void release_orphan_inode(struct f2fs_sb_info *);

void add_orphan_inode(struct f2fs_sb_info *, nid_t);

void remove_orphan_inode(struct f2fs_sb_info *, nid_t);

int recover_orphan_inodes(struct f2fs_sb_info *);

void recover_orphan_inodes(struct f2fs_sb_info *);

int get_valid_checkpoint(struct f2fs_sb_info *);

void set_dirty_dir_page(struct inode *, struct page *);

void add_dirty_dir_inode(struct inode *);

fs/f2fs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -952,9 +952,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	}



	/* if there are nt orphan nodes free them */

	err = -EINVAL;

	if (recover_orphan_inodes(sbi))

		goto free_node_inode;

	recover_orphan_inodes(sbi);



	/* read root inode and dentry */

	root = f2fs_iget(sb, F2FS_ROOT_INO(sbi));
@@ -963,8 +961,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		err = PTR_ERR(root);

		goto free_node_inode;

	}

	if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size)

	if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size) {

		err = -EINVAL;

		goto free_root_inode;

	}



	sb->s_root = d_make_root(root); /* allocate root dentry */

	if (!sb->s_root) {