Merge "f2fs: call f2fs_balance_fs outside of locked page" (66b6f363) · Commits · e / devices / android_kernel_fairphone_FP4

fs/f2fs/file.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
		struct page *page = vmf->page;
		struct inode *inode = file_inode(vmf->vma->vm_file);
		struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
		struct dnode_of_data dn = { .node_changed = false };
		struct dnode_of_data dn;
		int err;

		if (unlikely(f2fs_cp_error(sbi))) {
		@@ -58,6 +58,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
		goto err;
		}

		/* should do out of any locked page */
		f2fs_balance_fs(sbi, true);

		sb_start_pagefault(inode->i_sb);

		f2fs_bug_on(sbi, f2fs_has_inline_data(inode));
		@@ -115,8 +118,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
		out_sem:
		up_read(&F2FS_I(inode)->i_mmap_sem);

		f2fs_balance_fs(sbi, dn.node_changed);

		sb_end_pagefault(inode->i_sb);
		err:
		return block_page_mkwrite_return(err);