Commit f28b3434 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: introduce f2fs_update_data_blkaddr for cleanup 



Add a new help f2fs_update_data_blkaddr to clean up redundant codes.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4356e48e

fs/f2fs/data.c

+7 −2
Original line number Diff line number Diff line
@@ -300,6 +300,13 @@ void set_data_blkaddr(struct dnode_of_data *dn) 
		dn->node_changed = true;

}



void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)

{

	dn->data_blkaddr = blkaddr;

	set_data_blkaddr(dn);

	f2fs_update_extent_cache(dn);

}



int reserve_new_block(struct dnode_of_data *dn)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
@@ -1110,8 +1117,6 @@ int do_write_data_page(struct f2fs_io_info *fio) 
		trace_f2fs_do_write_data_page(page, IPU);

	} else {

		write_data_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);

		if (page->index == 0)

fs/f2fs/extent_cache.c

+6 −3
Original line number Diff line number Diff line
@@ -674,17 +674,20 @@ bool f2fs_lookup_extent_cache(struct inode *inode, pgoff_t pgofs, 
void f2fs_update_extent_cache(struct dnode_of_data *dn)

{

	pgoff_t fofs;

	block_t blkaddr;



	if (!f2fs_may_extent_tree(dn->inode))

		return;



	f2fs_bug_on(F2FS_I_SB(dn->inode), dn->data_blkaddr == NEW_ADDR);



	if (dn->data_blkaddr == NEW_ADDR)

		blkaddr = NULL_ADDR;

	else

		blkaddr = dn->data_blkaddr;



	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), dn->inode) +

								dn->ofs_in_node;



	if (f2fs_update_extent_tree_range(dn->inode, fofs, dn->data_blkaddr, 1))

	if (f2fs_update_extent_tree_range(dn->inode, fofs, blkaddr, 1))

		sync_inode_page(dn);

}

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,7 @@ void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *, struct inode *, 
int f2fs_submit_page_bio(struct f2fs_io_info *);

void f2fs_submit_page_mbio(struct f2fs_io_info *);

void set_data_blkaddr(struct dnode_of_data *);

void f2fs_update_data_blkaddr(struct dnode_of_data *, block_t);

int reserve_new_block(struct dnode_of_data *);

int f2fs_get_block(struct dnode_of_data *, pgoff_t);

ssize_t f2fs_preallocate_blocks(struct kiocb *, struct iov_iter *);

fs/f2fs/file.c

+3 −12
Original line number Diff line number Diff line
@@ -857,10 +857,8 @@ static int __exchange_data_block(struct inode *inode, pgoff_t src, 
	} else {

		new_addr = dn.data_blkaddr;

		if (!is_checkpointed_data(sbi, new_addr)) {

			dn.data_blkaddr = NULL_ADDR;

			/* do not invalidate this block address */

			set_data_blkaddr(&dn);

			f2fs_update_extent_cache(&dn);

			f2fs_update_data_blkaddr(&dn, NULL_ADDR);

			do_replace = true;

		}

		f2fs_put_dnode(&dn);
@@ -911,9 +909,7 @@ static int __exchange_data_block(struct inode *inode, pgoff_t src, 


err_out:

	if (!get_dnode_of_data(&dn, src, LOOKUP_NODE)) {

		dn.data_blkaddr = new_addr;

		set_data_blkaddr(&dn);

		f2fs_update_extent_cache(&dn);

		f2fs_update_data_blkaddr(&dn, new_addr);

		f2fs_put_dnode(&dn);

	}

	return ret;
@@ -1053,12 +1049,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, 


			if (dn.data_blkaddr != NEW_ADDR) {

				invalidate_blocks(sbi, dn.data_blkaddr);



				dn.data_blkaddr = NEW_ADDR;

				set_data_blkaddr(&dn);



				dn.data_blkaddr = NULL_ADDR;

				f2fs_update_extent_cache(&dn);

				f2fs_update_data_blkaddr(&dn, NEW_ADDR);

			}

			f2fs_put_dnode(&dn);

			f2fs_unlock_op(sbi);

fs/f2fs/gc.c

+1 −3
Original line number Diff line number Diff line
@@ -624,9 +624,7 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
	fio.new_blkaddr = newaddr;

	f2fs_submit_page_mbio(&fio);



	dn.data_blkaddr = fio.new_blkaddr;

	set_data_blkaddr(&dn);

	f2fs_update_extent_cache(&dn);

	f2fs_update_data_blkaddr(&dn, newaddr);

	set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);

	if (page->index == 0)

		set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);