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

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

f2fs: give a chance to detach from dirty list 



If there is no dirty pages in inode, we should give a chance to detach
the inode from global dirty list, otherwise it needs to call another
unnecessary .writepages for detaching.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2dd15654

fs/f2fs/data.c

+5 −3
Original line number Diff line number Diff line
@@ -1785,12 +1785,14 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset, 
		return;



	if (PageDirty(page)) {

		if (inode->i_ino == F2FS_META_INO(sbi))

		if (inode->i_ino == F2FS_META_INO(sbi)) {

			dec_page_count(sbi, F2FS_DIRTY_META);

		else if (inode->i_ino == F2FS_NODE_INO(sbi))

		} else if (inode->i_ino == F2FS_NODE_INO(sbi)) {

			dec_page_count(sbi, F2FS_DIRTY_NODES);

		else

		} else {

			inode_dec_dirty_pages(inode);

			remove_dirty_inode(inode);

		}

	}



	/* This is atomic written page, keep Private */

fs/f2fs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -742,6 +742,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
		ClearPagePrivate(page);

		ClearPageUptodate(page);

		inode_dec_dirty_pages(dir);

		remove_dirty_inode(dir);

	}

	f2fs_put_page(page, 1);

}

fs/f2fs/gc.c

+3 −1
Original line number Diff line number Diff line
@@ -673,8 +673,10 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type) 
retry:

		set_page_dirty(page);

		f2fs_wait_on_page_writeback(page, DATA, true);

		if (clear_page_dirty_for_io(page))

		if (clear_page_dirty_for_io(page)) {

			inode_dec_dirty_pages(inode);

			remove_dirty_inode(inode);

		}



		set_cold_data(page);

fs/f2fs/inline.c

+3 −1
Original line number Diff line number Diff line
@@ -137,8 +137,10 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) 
	fio.old_blkaddr = dn->data_blkaddr;

	write_data_page(dn, &fio);

	f2fs_wait_on_page_writeback(page, DATA, true);

	if (dirty)

	if (dirty) {

		inode_dec_dirty_pages(dn->inode);

		remove_dirty_inode(dn->inode);

	}



	/* this converted inline_data should be recovered. */

	set_inode_flag(dn->inode, FI_APPEND_WRITE);

fs/f2fs/node.c

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino) 


	ret = f2fs_write_inline_data(inode, page);

	inode_dec_dirty_pages(inode);

	remove_dirty_inode(inode);

	if (ret)

		set_page_dirty(page);

page_out: