f2fs: convert recover_orphan_inodes to void
Subsystems (2)
PATCH 5/5 f2fs: convert recover_orphan_inodes to void
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/checkpoint.c | 6 +++--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/super.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
fs/f2fs/checkpoint.c +3 -3
@@ -270,12 +270,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 ;
@@ -295,7 +295,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
@@ -1114,7 +1114,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
@@ -946,9 +946,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));
@@ -957,8 +955,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) {
Signature · 9 lines
1.7.9.5 ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk