1 files changed, 6 insertions, 3 deletions

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index e6b3ffd5ff6a..eb89037e3312 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -461,7 +461,7 @@ next_step:
  * as indirect or double indirect node blocks, are given, it must be a caller's
  * bug.
  */
-block_t start_bidx_of_node(unsigned int node_ofs)
+block_t start_bidx_of_node(unsigned int node_ofs, struct f2fs_inode_info *fi)
 {
         unsigned int indirect_blks = 2 * NIDS_PER_BLOCK + 4;
         unsigned int bidx;
@@ -478,7 +478,7 @@ block_t start_bidx_of_node(unsigned int node_ofs)
                 int dec = (node_ofs - indirect_blks - 3) / (NIDS_PER_BLOCK + 1);
                 bidx = node_ofs - 5 - dec;
         }
-        return bidx * ADDRS_PER_BLOCK + ADDRS_PER_INODE;
+        return bidx * ADDRS_PER_BLOCK + ADDRS_PER_INODE(fi);
 }
 
 static int check_dnode(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
@@ -586,7 +586,6 @@ next_step:
                         continue;
                 }
 
-                start_bidx = start_bidx_of_node(nofs);
                 ofs_in_node = le16_to_cpu(entry->ofs_in_node);
 
                 if (phase == 2) {
@@ -594,6 +593,8 @@ next_step:
                         if (IS_ERR(inode))
                                 continue;
 
+                        start_bidx = start_bidx_of_node(nofs, F2FS_I(inode));
+
                         data_page = find_data_page(inode,
                                         start_bidx + ofs_in_node, false);
                         if (IS_ERR(data_page))
@@ -604,6 +605,8 @@ next_step:
                 } else {
                         inode = find_gc_inode(dni.ino, ilist);
                         if (inode) {
+                                start_bidx = start_bidx_of_node(nofs,
+                                                                F2FS_I(inode));
                                 data_page = get_lock_data_page(inode,
                                                 start_bidx + ofs_in_node);
                                 if (IS_ERR(data_page))