f2fs: enhance on-disk inode structure scalability

[sfrench/cifs-2.6.git] / fs / f2fs / recovery.c

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 907d6b7dde6a7f636ea7027d461cfd029b8b1ae5..2d9b8182691feb6bc117b43d1c2ba6bef5946ef3 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -361,7 +361,8 @@ out:
        return 0;
 
 truncate_out:
-       if (datablock_addr(tdn.node_page, tdn.ofs_in_node) == blkaddr)
+       if (datablock_addr(tdn.inode, 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);
@@ -414,8 +415,8 @@ retry_dn:
        for (; start < end; start++, dn.ofs_in_node++) {
                block_t src, dest;
 
-               src = datablock_addr(dn.node_page, dn.ofs_in_node);
-               dest = datablock_addr(page, dn.ofs_in_node);
+               src = datablock_addr(dn.inode, dn.node_page, dn.ofs_in_node);
+               dest = datablock_addr(dn.inode, page, dn.ofs_in_node);
 
                /* skip recovering if dest is the same as src */
                if (src == dest)