From 8f3ddf41c7d7cc68dfb1d3ec04a080e5cdca19b3 Mon Sep 17 00:00:00 2001
From: Jiro SEKIBA <jir@unicus.jp>
Date: Fri, 27 Nov 2009 19:41:07 +0900
Subject: [PATCH] --- yaml --- r: 174718 b: refs/heads/master c:
 43f8bc262fcfadc7583b2353d2708e6eb77788ff h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nilfs2/dir.c   | 1 -
 trunk/fs/nilfs2/namei.c | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6d0c556a1e94..458ba7ed52d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ca941d4b62e72571948efe5a73c563b4cacc98d
+refs/heads/master: 43f8bc262fcfadc7583b2353d2708e6eb77788ff
diff --git a/trunk/fs/nilfs2/dir.c b/trunk/fs/nilfs2/dir.c
index e097099bfc8f..4f3fa0030e2c 100644
--- a/trunk/fs/nilfs2/dir.c
+++ b/trunk/fs/nilfs2/dir.c
@@ -459,7 +459,6 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,
 	nilfs_put_page(page);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 /*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */
-	mark_inode_dirty(dir);
 }
 
 /*
diff --git a/trunk/fs/nilfs2/namei.c b/trunk/fs/nilfs2/namei.c
index 01adda823297..4616f96be700 100644
--- a/trunk/fs/nilfs2/namei.c
+++ b/trunk/fs/nilfs2/namei.c
@@ -397,6 +397,7 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 			goto out_dir;
 		inode_inc_link_count(old_inode);
 		nilfs_set_link(new_dir, new_de, new_page, old_inode);
+		mark_inode_dirty(new_dir);
 		new_inode->i_ctime = CURRENT_TIME;
 		if (dir_de)
 			drop_nlink(new_inode);
@@ -425,12 +426,13 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	old_inode->i_ctime = CURRENT_TIME;
 
 	nilfs_delete_entry(old_de, old_page);
-	inode_dec_link_count(old_inode);
+	drop_nlink(old_inode);
 
 	if (dir_de) {
 		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
 		inode_dec_link_count(old_dir);
 	}
+	mark_inode_dirty(old_inode);
 
 	err = nilfs_transaction_commit(old_dir->i_sb);
 	return err;