Skip to content

Commit

Permalink
f2fs: trival cleanup in move_data_block()
Browse files Browse the repository at this point in the history
Trival cleanups:
- relocate set_summary() before its use
- relocate "allocate block address" to correct place
- remove unneeded f2fs_wait_on_page_writeback()

Signed-off-by: Chao Yu <[email protected]>
Signed-off-by: Jaegeuk Kim <[email protected]>
  • Loading branch information
chaseyu authored and Jaegeuk Kim committed Jan 27, 2021
1 parent 2562515 commit cf74040
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions fs/f2fs/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1169,8 +1169,6 @@ static int move_data_block(struct inode *inode, block_t bidx,
if (err)
goto put_out;

set_summary(&sum, dn.nid, dn.ofs_in_node, ni.version);

/* read page */
fio.page = page;
fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;
Expand Down Expand Up @@ -1207,6 +1205,9 @@ static int move_data_block(struct inode *inode, block_t bidx,
}
}

set_summary(&sum, dn.nid, dn.ofs_in_node, ni.version);

/* allocate block address */
f2fs_allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &newaddr,
&sum, type, NULL);

Expand All @@ -1233,9 +1234,6 @@ static int move_data_block(struct inode *inode, block_t bidx,
set_page_writeback(fio.encrypted_page);
ClearPageError(page);

/* allocate block address */
f2fs_wait_on_page_writeback(dn.node_page, NODE, true, true);

fio.op = REQ_OP_WRITE;
fio.op_flags = REQ_SYNC;
fio.new_blkaddr = newaddr;
Expand Down

0 comments on commit cf74040

Please sign in to comment.