f2fs: add F2FS_INLINE_DOTS to recover missing dot dentries

[deliverable/linux.git] / fs / f2fs / recovery.c

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 41afb9534bbdcb66a20ea6650fc71f62a8b99034..679c465e9def191ba1831eb0894931df0fbeeed9 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -115,7 +115,7 @@ retry:
                iput(einode);
                goto retry;
        }
-       err = __f2fs_add_link(dir, &name, inode);
+       err = __f2fs_add_link(dir, &name, inode, inode->i_ino, inode->i_mode);
        if (err)
                goto out_err;
 
@@ -212,8 +212,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head)
                        if (IS_ERR(entry->inode)) {
                                err = PTR_ERR(entry->inode);
                                kmem_cache_free(fsync_entry_slab, entry);
-                               if (err == -ENOENT)
+                               if (err == -ENOENT) {
+                                       err = 0;
                                        goto next;
+                               }
                                break;
                        }
                        list_add_tail(&entry->list, head);
@@ -256,6 +258,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
        struct f2fs_summary_block *sum_node;
        struct f2fs_summary sum;
        struct page *sum_page, *node_page;
+       struct dnode_of_data tdn = *dn;
        nid_t ino, nid;
        struct inode *inode;
        unsigned int offset;
@@ -283,17 +286,15 @@ got_it:
        /* Use the locked dnode page and inode */
        nid = le32_to_cpu(sum.nid);
        if (dn->inode->i_ino == nid) {
-               struct dnode_of_data tdn = *dn;
                tdn.nid = nid;
+               if (!dn->inode_page_locked)
+                       lock_page(dn->inode_page);
                tdn.node_page = dn->inode_page;
                tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
-               truncate_data_blocks_range(&tdn, 1);
-               return 0;
+               goto truncate_out;
        } else if (dn->nid == nid) {
-               struct dnode_of_data tdn = *dn;
                tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
-               truncate_data_blocks_range(&tdn, 1);
-               return 0;
+               goto truncate_out;
        }
 
        /* Get the node page */
@@ -317,18 +318,33 @@ got_it:
        bidx = start_bidx_of_node(offset, F2FS_I(inode)) +
                        le16_to_cpu(sum.ofs_in_node);
 
-       if (ino != dn->inode->i_ino) {
-               truncate_hole(inode, bidx, bidx + 1);
+       /*
+        * if inode page is locked, unlock temporarily, but its reference
+        * count keeps alive.
+        */
+       if (ino == dn->inode->i_ino && dn->inode_page_locked)
+               unlock_page(dn->inode_page);
+
+       set_new_dnode(&tdn, inode, NULL, NULL, 0);
+       if (get_dnode_of_data(&tdn, bidx, LOOKUP_NODE))
+               goto out;
+
+       if (tdn.data_blkaddr == blkaddr)
+               truncate_data_blocks_range(&tdn, 1);
+
+       f2fs_put_dnode(&tdn);
+out:
+       if (ino != dn->inode->i_ino)
                iput(inode);
-       } else {
-               struct dnode_of_data tdn;
-               set_new_dnode(&tdn, inode, dn->inode_page, NULL, 0);
-               if (get_dnode_of_data(&tdn, bidx, LOOKUP_NODE))
-                       return 0;
-               if (tdn.data_blkaddr != NULL_ADDR)
-                       truncate_data_blocks_range(&tdn, 1);
-               f2fs_put_page(tdn.node_page, 1);
-       }
+       else if (dn->inode_page_locked)
+               lock_page(dn->inode_page);
+       return 0;
+
+truncate_out:
+       if (datablock_addr(tdn.node_page, tdn.ofs_in_node) == blkaddr)
+               truncate_data_blocks_range(&tdn, 1);
+       if (dn->inode->i_ino == nid && !dn->inode_page_locked)
+               unlock_page(dn->inode_page);
        return 0;
 }
 
@@ -401,14 +417,13 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
                        /* write dummy data page */
                        recover_data_page(sbi, NULL, &sum, src, dest);
                        dn.data_blkaddr = dest;
-                       update_extent_cache(&dn);
+                       set_data_blkaddr(&dn);
+                       f2fs_update_extent_cache(&dn);
                        recovered++;
                }
                dn.ofs_in_node++;
        }
 
-       /* write node page in place */
-       set_summary(&sum, dn.nid, 0, 0);
        if (IS_INODE(dn.node_page))
                sync_inode_page(&dn);