f2fs: split set_data_blkaddr from f2fs_update_extent_cache

Split __set_data_blkaddr from f2fs_update_extent_cache for readability.

Additionally rename __set_data_blkaddr to set_data_blkaddr for exporting.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 241b98741df98cde9ceb1a14ded9dc43645f3fb1..6492f88a2cc486ce4b31038ec23d14255135a576 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -200,7 +200,7 @@ alloc_new:
  *  ->node_page
  *    update block addresses in the node page
  */
-static void __set_data_blkaddr(struct dnode_of_data *dn)
+void set_data_blkaddr(struct dnode_of_data *dn)
 {
        struct f2fs_node *rn;
        __le32 *addr_array;
@@ -229,7 +229,7 @@ int reserve_new_block(struct dnode_of_data *dn)
        trace_f2fs_reserve_new_block(dn->inode, dn->nid, dn->ofs_in_node);
 
        dn->data_blkaddr = NEW_ADDR;
-       __set_data_blkaddr(dn);
+       set_data_blkaddr(dn);
        mark_inode_dirty(dn->inode);
        sync_inode_page(dn);
        return 0;
@@ -784,9 +784,6 @@ void f2fs_update_extent_cache(struct dnode_of_data *dn)
 
        f2fs_bug_on(F2FS_I_SB(dn->inode), dn->data_blkaddr == NEW_ADDR);
 
-       /* Update the page address in the parent node */
-       __set_data_blkaddr(dn);
-
        if (is_inode_flag_set(fi, FI_NO_EXTENT))
                return;
 
@@ -1032,7 +1029,7 @@ static int __allocate_data_block(struct dnode_of_data *dn)
        allocate_data_block(sbi, NULL, NULL_ADDR, &dn->data_blkaddr, &sum, seg);
 
        /* direct IO doesn't use extent cache to maximize the performance */
-       __set_data_blkaddr(dn);
+       set_data_blkaddr(dn);
 
        /* update i_size */
        fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
@@ -1290,6 +1287,7 @@ int do_write_data_page(struct page *page, struct f2fs_io_info *fio)
                trace_f2fs_do_write_data_page(page, IPU);
        } else {
                write_data_page(page, &dn, fio);
+               set_data_blkaddr(&dn);
                f2fs_update_extent_cache(&dn);
                trace_f2fs_do_write_data_page(page, OPU);
                set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c9818193e15e2d33f9749ca9a910241ff28fcfe2..83223d8b32bb545dd2cc99a0dfe956ae47f33210 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1591,6 +1591,7 @@ int f2fs_submit_page_bio(struct f2fs_sb_info *, struct page *,
                                                struct f2fs_io_info *);
 void f2fs_submit_page_mbio(struct f2fs_sb_info *, struct page *,
                                                struct f2fs_io_info *);
+void set_data_blkaddr(struct dnode_of_data *);
 int reserve_new_block(struct dnode_of_data *);
 int f2fs_reserve_block(struct dnode_of_data *, pgoff_t);
 void f2fs_shrink_extent_tree(struct f2fs_sb_info *, int);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 39a07a59b1348dd39a9cca68e638951f1b43c907..da13929654247709b211927252849c69256f1bca 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -435,6 +435,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)
                        continue;
 
                dn->data_blkaddr = NULL_ADDR;
+               set_data_blkaddr(dn);
                f2fs_update_extent_cache(dn);
                invalidate_blocks(sbi, blkaddr);
                if (dn->ofs_in_node == 0 && IS_INODE(dn->node_page))

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 375d2c797f4c85dff8cf04017e04412695caeaa7..8241a87046c30decfad8e648719e4f885c69ba79 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -131,6 +131,7 @@ no_update:
        set_page_writeback(page);
        fio.blk_addr = dn->data_blkaddr;
        write_data_page(page, dn, &fio);
+       set_data_blkaddr(dn);
        f2fs_update_extent_cache(dn);
        f2fs_wait_on_page_writeback(page, DATA);
        if (dirty)

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 6e40874dfbb9883b2a9db43aafbc71dbbbee2a6e..e60ffaa380f1099f097c59a3dd4ba4483e856925 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -403,6 +403,7 @@ 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;
+                       set_data_blkaddr(&dn);
                        f2fs_update_extent_cache(&dn);
                        recovered++;
                }