Commit 25cc5d3b authored by Jaegeuk Kim's avatar Jaegeuk Kim

f2fs: avoid reading NAT page by get_node_info

We've not seen this buggy case for a long time, so it's time to avoid this
unnecessary get_node_info() call which reading NAT page to cache nat entry.
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9b064f7d
...@@ -1028,7 +1028,7 @@ struct page *new_node_page(struct dnode_of_data *dn, ...@@ -1028,7 +1028,7 @@ struct page *new_node_page(struct dnode_of_data *dn,
unsigned int ofs, struct page *ipage) unsigned int ofs, struct page *ipage)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
struct node_info old_ni, new_ni; struct node_info new_ni;
struct page *page; struct page *page;
int err; int err;
...@@ -1043,13 +1043,15 @@ struct page *new_node_page(struct dnode_of_data *dn, ...@@ -1043,13 +1043,15 @@ struct page *new_node_page(struct dnode_of_data *dn,
err = -ENOSPC; err = -ENOSPC;
goto fail; goto fail;
} }
#ifdef CONFIG_F2FS_CHECK_FS
get_node_info(sbi, dn->nid, &old_ni); get_node_info(sbi, dn->nid, &new_ni);
f2fs_bug_on(sbi, new_ni.blk_addr != NULL_ADDR);
/* Reinitialize old_ni with new node page */ #endif
f2fs_bug_on(sbi, old_ni.blk_addr != NULL_ADDR); new_ni.nid = dn->nid;
new_ni = old_ni;
new_ni.ino = dn->inode->i_ino; new_ni.ino = dn->inode->i_ino;
new_ni.blk_addr = NULL_ADDR;
new_ni.flag = 0;
new_ni.version = 0;
set_node_addr(sbi, &new_ni, NEW_ADDR, false); set_node_addr(sbi, &new_ni, NEW_ADDR, false);
f2fs_wait_on_page_writeback(page, NODE, true); f2fs_wait_on_page_writeback(page, NODE, true);
......
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