Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c4db1a6 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: clean up f2fs_balance_fs 



This patch adds one parameter to clean up all the callers of f2fs_balance_fs.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2a4b8e9f

fs/f2fs/data.c

+6 −11
Original line number Diff line number Diff line
@@ -546,8 +546,7 @@ static int __allocate_data_blocks(struct inode *inode, loff_t offset, 
		f2fs_put_dnode(&dn);

		f2fs_unlock_op(sbi);



		if (dn.node_changed)

			f2fs_balance_fs(sbi);

		f2fs_balance_fs(sbi, dn.node_changed);

	}

	return err;
@@ -557,8 +556,7 @@ static int __allocate_data_blocks(struct inode *inode, loff_t offset, 
	f2fs_put_dnode(&dn);

out:

	f2fs_unlock_op(sbi);

	if (dn.node_changed)

		f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, dn.node_changed);

	return err;

}
@@ -657,8 +655,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 


		if (create) {

			f2fs_unlock_op(sbi);

			if (dn.node_changed)

				f2fs_balance_fs(sbi);

			f2fs_balance_fs(sbi, dn.node_changed);

			f2fs_lock_op(sbi);

		}
@@ -718,8 +715,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
unlock_out:

	if (create) {

		f2fs_unlock_op(sbi);

		if (dn.node_changed)

			f2fs_balance_fs(sbi);

		f2fs_balance_fs(sbi, dn.node_changed);

	}

out:

	trace_f2fs_map_blocks(inode, map, err);
@@ -1178,8 +1174,7 @@ static int f2fs_write_data_page(struct page *page, 
	if (err)

		ClearPageUptodate(page);

	unlock_page(page);

	if (need_balance_fs)

		f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, need_balance_fs);

	if (wbc->for_reclaim || unlikely(f2fs_cp_error(sbi))) {

		f2fs_submit_merged_bio(sbi, DATA, WRITE);

		remove_dirty_inode(inode);
@@ -1506,7 +1501,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 


	if (need_balance && has_not_enough_free_secs(sbi, 0)) {

		unlock_page(page);

		f2fs_balance_fs(sbi);

		f2fs_balance_fs(sbi, true);

		lock_page(page);

		if (page->mapping != mapping) {

			/* The page got truncated from under us */

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ void destroy_node_manager_caches(void); 
 */

void register_inmem_page(struct inode *, struct page *);

int commit_inmem_pages(struct inode *, bool);

void f2fs_balance_fs(struct f2fs_sb_info *);

void f2fs_balance_fs(struct f2fs_sb_info *, bool);

void f2fs_balance_fs_bg(struct f2fs_sb_info *);

int f2fs_issue_flush(struct f2fs_sb_info *);

int create_flush_cmd_control(struct f2fs_sb_info *);

fs/f2fs/file.c

+8 −9
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, 
	f2fs_put_dnode(&dn);

	f2fs_unlock_op(sbi);



	if (dn.node_changed)

		f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, dn.node_changed);



	file_update_time(vma->vm_file);

	lock_page(page);
@@ -677,7 +676,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) 
			err = f2fs_truncate(inode, true);

			if (err)

				return err;

			f2fs_balance_fs(F2FS_I_SB(inode));

			f2fs_balance_fs(F2FS_I_SB(inode), true);

		} else {

			/*

			 * do not trim all blocks after i_size if target size is
@@ -732,7 +731,7 @@ static int fill_zero(struct inode *inode, pgoff_t index, 
	if (!len)

		return 0;



	f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, true);



	f2fs_lock_op(sbi);

	page = get_new_data_page(inode, NULL, index, false);
@@ -818,7 +817,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) 
			loff_t blk_start, blk_end;

			struct f2fs_sb_info *sbi = F2FS_I_SB(inode);



			f2fs_balance_fs(sbi);

			f2fs_balance_fs(sbi, true);



			blk_start = (loff_t)pg_start << PAGE_CACHE_SHIFT;

			blk_end = (loff_t)pg_end << PAGE_CACHE_SHIFT;
@@ -921,7 +920,7 @@ static int f2fs_do_collapse(struct inode *inode, pgoff_t start, pgoff_t end) 
	int ret = 0;



	for (; end < nrpages; start++, end++) {

		f2fs_balance_fs(sbi);

		f2fs_balance_fs(sbi, true);

		f2fs_lock_op(sbi);

		ret = __exchange_data_block(inode, end, start, true);

		f2fs_unlock_op(sbi);
@@ -1103,7 +1102,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	if (ret)

		return ret;



	f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, true);



	ret = truncate_blocks(inode, i_size_read(inode), true);

	if (ret)
@@ -1155,7 +1154,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset, 
	if (ret)

		return ret;



	f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, true);



	pg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT;

	pg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT;
@@ -1653,7 +1652,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi, 
	pg_start = range->start >> PAGE_CACHE_SHIFT;

	pg_end = (range->start + range->len) >> PAGE_CACHE_SHIFT;



	f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, true);



	mutex_lock(&inode->i_mutex);

fs/f2fs/inline.c

+1 −2
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ int f2fs_convert_inline_inode(struct inode *inode) 


	f2fs_put_page(page, 1);



	if (dn.node_changed)

		f2fs_balance_fs(sbi);

	f2fs_balance_fs(sbi, dn.node_changed);



	return err;

}

fs/f2fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc) 
	 * during the urgent cleaning time when runing out of free sections.

	 */

	if (update_inode_page(inode))

		f2fs_balance_fs(sbi);

		f2fs_balance_fs(sbi, true);

	return 0;

}