f2fs: do not increase link count during recovery

If there are multiple fsynced dnodes having a dent flag, roll-forward routine
sets FI_INC_LINK for their inode, and recovery_dentry increases its link count
accordingly.
That results in normal file having a link count as 2, so we can't unlink those
files.

This was added to handle several inode blocks having same inode number with
different directory paths.
But, current f2fs doesn't replay all of path changes and only recover its dentry
for the last fsynced inode block.
So, there is no reason to do this.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 679c465e9def191ba1831eb0894931df0fbeeed9..63b720bd7e75f9b662735c4e71e6d94a670185c0 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -93,10 +93,9 @@ static int recover_dentry(struct inode *inode, struct page *ipage)
        }
 retry:
        de = f2fs_find_entry(dir, &name, &page);
-       if (de && inode->i_ino == le32_to_cpu(de->ino)) {
-               clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
+       if (de && inode->i_ino == le32_to_cpu(de->ino))
                goto out_unmap_put;
-       }
+
        if (de) {
                einode = f2fs_iget(inode->i_sb, le32_to_cpu(de->ino));
                if (IS_ERR(einode)) {
@@ -187,11 +186,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head)
                        goto next;
 
                entry = get_fsync_inode(head, ino_of_node(page));
-               if (entry) {
-                       if (IS_INODE(page) && is_dent_dnode(page))
-                               set_inode_flag(F2FS_I(entry->inode),
-                                                       FI_INC_LINK);
-               } else {
+               if (!entry) {
                        if (IS_INODE(page) && is_dent_dnode(page)) {
                                err = recover_inode_page(sbi, page);
                                if (err)