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

Commit a18ff063 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: call mark_inode_dirty to flush dirty pages 



If a dentry page is updated, we should call mark_inode_dirty to add the inode
into the dirty list, so that its dentry pages are flushed to the disk.
Otherwise, the inode can be evicted without flush.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 6c311ec6

fs/f2fs/data.c

+3 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ int reserve_new_block(struct dnode_of_data *dn) 


	__set_data_blkaddr(dn, NEW_ADDR);

	dn->data_blkaddr = NEW_ADDR;

	mark_inode_dirty(dn->inode);

	sync_inode_page(dn);

	return 0;

}
@@ -564,7 +565,6 @@ struct page *get_new_data_page(struct inode *inode, 
		i_size_write(inode, ((index + 1) << PAGE_CACHE_SHIFT));

		/* Only the directory inode sets new_i_size */

		set_inode_flag(F2FS_I(inode), FI_UPDATE_DIR);

		mark_inode_dirty_sync(inode);

	}

	return page;
@@ -1060,6 +1060,8 @@ static int f2fs_set_data_page_dirty(struct page *page) 
	trace_f2fs_set_page_dirty(page, DATA);



	SetPageUptodate(page);

	mark_inode_dirty(inode);



	if (!PageDirty(page)) {

		__set_page_dirty_nobuffers(page);

		set_dirty_dir_page(inode, page);

fs/f2fs/dir.c

+2 −4
Original line number Diff line number Diff line
@@ -388,6 +388,8 @@ static void update_parent_metadata(struct inode *dir, struct inode *inode, 
		clear_inode_flag(F2FS_I(inode), FI_NEW_INODE);

	}

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

	mark_inode_dirty(dir);



	if (F2FS_I(dir)->i_current_depth != current_depth) {

		F2FS_I(dir)->i_current_depth = current_depth;

		set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);
@@ -395,8 +397,6 @@ static void update_parent_metadata(struct inode *dir, struct inode *inode, 


	if (is_inode_flag_set(F2FS_I(dir), FI_UPDATE_DIR))

		update_inode_page(dir);

	else

		mark_inode_dirty(dir);



	if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK))

		clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
@@ -553,8 +553,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	if (inode && S_ISDIR(inode->i_mode)) {

		drop_nlink(dir);

		update_inode_page(dir);

	} else {

		mark_inode_dirty(dir);

	}



	if (inode) {

fs/f2fs/namei.c

+3 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (old_dir_entry)

			drop_nlink(new_inode);

		drop_nlink(new_inode);

		mark_inode_dirty(new_inode);



		if (!new_inode->i_nlink)

			add_orphan_inode(sbi, new_inode->i_ino);
@@ -459,11 +460,13 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			f2fs_set_link(old_inode, old_dir_entry,

						old_dir_page, new_dir);

			F2FS_I(old_inode)->i_pino = new_dir->i_ino;

			update_inode_page(old_inode);

		} else {

			kunmap(old_dir_page);

			f2fs_put_page(old_dir_page, 0);

		}

		drop_nlink(old_dir);

		mark_inode_dirty(old_dir);

		update_inode_page(old_dir);

	}