Commit 86928f98 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid not to call remove_dirty_inode



There is an errorneous case during the recovery like below.

In recovery_dentry,
 1) dir = f2fs_iget();
 2) mark the dir with FI_DELAY_IPUT
 3) goto unmap_out

After the end of recovery routine, there is no dirty dentries so the dir cannot
be released by iput in remove_dirty_dir_inode.

This patch fixes such the bug case by handling the iget and iput in the
recovery_dentry procedure.
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6fa1df53
......@@ -52,20 +52,13 @@ static int recover_dentry(struct page *ipage, struct inode *inode)
goto out;
}
if (is_inode_flag_set(F2FS_I(dir), FI_DIRTY_DIR)) {
iput(dir);
} else {
add_dirty_dir_inode(dir);
set_inode_flag(F2FS_I(dir), FI_DELAY_IPUT);
}
name.len = le32_to_cpu(raw_inode->i_namelen);
name.name = raw_inode->i_name;
if (unlikely(name.len > F2FS_NAME_LEN)) {
WARN_ON(1);
err = -ENAMETOOLONG;
goto out;
goto out_err;
}
retry:
de = f2fs_find_entry(dir, &name, &page);
......@@ -90,11 +83,23 @@ static int recover_dentry(struct page *ipage, struct inode *inode)
goto retry;
}
err = __f2fs_add_link(dir, &name, inode);
if (err)
goto out_err;
if (is_inode_flag_set(F2FS_I(dir), FI_DELAY_IPUT)) {
iput(dir);
} else {
add_dirty_dir_inode(dir);
set_inode_flag(F2FS_I(dir), FI_DELAY_IPUT);
}
goto out;
out_unmap_put:
kunmap(page);
f2fs_put_page(page, 0);
out_err:
iput(dir);
out:
f2fs_msg(inode->i_sb, KERN_NOTICE,
"%s: ino = %x, name = %s, dir = %lx, err = %d",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment