f2fs: clean up opened code w/ {get,set}_nid()

Just cleanup, no logic change.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index af36c6d..7d904f2 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1066,7 +1066,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,
        int i;
        int idx = depth - 2;
 
-       nid[0] = le32_to_cpu(ri->i_nid[offset[0] - NODE_DIR1_BLOCK]);
+       nid[0] = get_nid(dn->inode_page, offset[0], true);
        if (!nid[0])
                return 0;
 
@@ -1177,7 +1177,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)
 
 skip_partial:
        while (cont) {
-               dn.nid = le32_to_cpu(ri->i_nid[offset[0] - NODE_DIR1_BLOCK]);
+               dn.nid = get_nid(page, offset[0], true);
                switch (offset[0]) {
                case NODE_DIR1_BLOCK:
                case NODE_DIR2_BLOCK:
@@ -1209,13 +1209,10 @@ skip_partial:
                }
                if (err < 0)
                        goto fail;
-               if (offset[1] == 0 &&
-                               ri->i_nid[offset[0] - NODE_DIR1_BLOCK]) {
+               if (offset[1] == 0 && get_nid(page, offset[0], true)) {
                        lock_page(page);
                        BUG_ON(page->mapping != NODE_MAPPING(sbi));
-                       f2fs_wait_on_page_writeback(page, NODE, true, true);
-                       ri->i_nid[offset[0] - NODE_DIR1_BLOCK] = 0;
-                       set_page_dirty(page);
+                       set_nid(page, offset[0], 0, true);
                        unlock_page(page);
                }
                offset[1] = 0;