summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2017-02-13 17:02:44 -0800
committerJaegeuk Kim <jaegeuk@kernel.org>2017-02-23 10:21:47 -0800
commit25cc5d3b9dde074bfa06024fd6486020963807da (patch)
tree373ccd71c1479e1ca8eabc6d6dbb814a07f48464 /fs/f2fs
parent9b064f7d0c9ab179b9cb18e144ab65d7ea953443 (diff)
downloadlinux-stable-25cc5d3b9dde074bfa06024fd6486020963807da.tar.gz
linux-stable-25cc5d3b9dde074bfa06024fd6486020963807da.tar.bz2
linux-stable-25cc5d3b9dde074bfa06024fd6486020963807da.zip
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: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/node.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index f8fb25a27b46..8ebc4c78e6a4 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1028,7 +1028,7 @@ struct page *new_node_page(struct dnode_of_data *dn,
unsigned int ofs, struct page *ipage)
{
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;
int err;
@@ -1043,13 +1043,15 @@ struct page *new_node_page(struct dnode_of_data *dn,
err = -ENOSPC;
goto fail;
}
-
- get_node_info(sbi, dn->nid, &old_ni);
-
- /* Reinitialize old_ni with new node page */
- f2fs_bug_on(sbi, old_ni.blk_addr != NULL_ADDR);
- new_ni = old_ni;
+#ifdef CONFIG_F2FS_CHECK_FS
+ get_node_info(sbi, dn->nid, &new_ni);
+ f2fs_bug_on(sbi, new_ni.blk_addr != NULL_ADDR);
+#endif
+ new_ni.nid = dn->nid;
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);
f2fs_wait_on_page_writeback(page, NODE, true);