commit 30446592ff797f220ee14aa523646e51f66360ea
author Evan McClain <aeroevan@gmail.com> Fri Aug 08 08:58:58 2014 -0400
committer flintman <flintman@flintmancomputers.com> Sat Jan 24 11:37:57 2015 -0500
tree e1ad52299dbe6d463fe68b5eff32a5c8b9c20757
parent f3f030d1bcfad3165cb8b19709345bb05d1e81bf

f2fs: resync with upstream 3.4 branch (forced update)

Change-Id: I0307382d983e8ef806cfdfe57dcde500fd060995

fs/f2fs/inode.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 679ee78..d829f4e 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -261,13 +261,14 @@
 void f2fs_evict_inode(struct inode *inode)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
+	nid_t xnid = F2FS_I(inode)->i_xattr_nid;
 
 	trace_f2fs_evict_inode(inode);
 	truncate_inode_pages(&inode->i_data, 0);
 
 	if (inode->i_ino == F2FS_NODE_INO(sbi) ||
 			inode->i_ino == F2FS_META_INO(sbi))
-		goto no_delete;
+		goto out_clear;
 
 	f2fs_bug_on(get_dirty_dents(inode));
 	remove_dirty_dir_inode(inode);
@@ -287,6 +288,13 @@
 	f2fs_unlock_op(sbi);
 
 no_delete:
-	end_writeback(inode);
 	invalidate_mapping_pages(NODE_MAPPING(sbi), inode->i_ino, inode->i_ino);
+	if (xnid)
+		invalidate_mapping_pages(NODE_MAPPING(sbi), xnid, xnid);
+	if (is_inode_flag_set(F2FS_I(inode), FI_APPEND_WRITE))
+		add_dirty_inode(sbi, inode->i_ino, APPEND_INO);
+	if (is_inode_flag_set(F2FS_I(inode), FI_UPDATE_WRITE))
+		add_dirty_inode(sbi, inode->i_ino, UPDATE_INO);
+out_clear:
+	end_writeback(inode);
 }