From 40690be6e19b17a6ef5cd95fa013e2fdeef4c4f4 Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Wed, 20 Jun 2012 12:52:57 -0700 Subject: [PATCH] --- yaml --- r: 311107 b: refs/heads/master c: fbb24a3a915f105016f1c828476be11aceac8504 h: refs/heads/master i: 311105: e1b1f0cb5d1179be33ca93bce31e467ac5e5ea31 311103: 1583e84c9153592422d204449c5d80509a47fbfb v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/gcinode.c | 2 ++ trunk/fs/nilfs2/segment.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d0ab35cd50cb..5866b12a47a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4eed03fd06578571c01d4f1478c874bb432c815 +refs/heads/master: fbb24a3a915f105016f1c828476be11aceac8504 diff --git a/trunk/fs/nilfs2/gcinode.c b/trunk/fs/nilfs2/gcinode.c index 08a07a218d26..57ceaf33d177 100644 --- a/trunk/fs/nilfs2/gcinode.c +++ b/trunk/fs/nilfs2/gcinode.c @@ -191,6 +191,8 @@ void nilfs_remove_all_gcinodes(struct the_nilfs *nilfs) while (!list_empty(head)) { ii = list_first_entry(head, struct nilfs_inode_info, i_dirty); list_del_init(&ii->i_dirty); + truncate_inode_pages(&ii->vfs_inode.i_data, 0); + nilfs_btnode_cache_clear(&ii->i_btnode_cache); iput(&ii->vfs_inode); } } diff --git a/trunk/fs/nilfs2/segment.c b/trunk/fs/nilfs2/segment.c index 0e72ad6f22aa..88e11fb346b6 100644 --- a/trunk/fs/nilfs2/segment.c +++ b/trunk/fs/nilfs2/segment.c @@ -2309,6 +2309,8 @@ nilfs_remove_written_gcinodes(struct the_nilfs *nilfs, struct list_head *head) if (!test_bit(NILFS_I_UPDATED, &ii->i_state)) continue; list_del_init(&ii->i_dirty); + truncate_inode_pages(&ii->vfs_inode.i_data, 0); + nilfs_btnode_cache_clear(&ii->i_btnode_cache); iput(&ii->vfs_inode); } }