From 4763d7b12e0ed4f9590087fc5ffc9f234228819d Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 25 Jun 2007 10:09:33 -0400
Subject: [PATCH] --- yaml --- r: 128415 b: refs/heads/master c:
 79c44584ea346024e929ac0f2a3577aac33b7b3f h: refs/heads/master i:   128413:
 fdd3239b9bc4f8322b01fd1dba876a6e835d5433   128411:
 1b30ad1730ee40895d90d8a8c41768baf967f3f6   128407:
 b43c9d12992ba6e3c46d1631c07f482bf656da53   128399:
 26ecb28be239c3097adf91a29228f1a1848f2b3b   128383:
 fe58e7879c89e7208e55cac2499cb3e283a2bf6b v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4a8e8481eca..768719e0a460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2220da64727a1e31765ed4e17cd98f39749094
+refs/heads/master: 79c44584ea346024e929ac0f2a3577aac33b7b3f
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 9d2a0a3f674d..eba06e7cf414 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -250,6 +250,7 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
 	btrfs_free_path(path);
 	if (!ret) {
 		dir->i_size -= name_len * 2;
+		dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 		btrfs_update_inode(trans, root, dir);
 		drop_nlink(dentry->d_inode);
 		ret = btrfs_update_inode(trans, root, dentry->d_inode);
@@ -1037,6 +1038,7 @@ static int btrfs_add_link(struct btrfs_trans_handle *trans,
 	int ret;
 	struct btrfs_key key;
 	struct btrfs_root *root = BTRFS_I(dentry->d_parent->d_inode)->root;
+	struct inode *parent_inode;
 	key.objectid = inode->i_ino;
 	key.flags = 0;
 	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
@@ -1047,7 +1049,9 @@ static int btrfs_add_link(struct btrfs_trans_handle *trans,
 				    dentry->d_parent->d_inode->i_ino,
 				    &key, btrfs_inode_type(inode));
 	if (ret == 0) {
-		dentry->d_parent->d_inode->i_size += dentry->d_name.len * 2;
+		parent_inode = dentry->d_parent->d_inode;
+		parent_inode->i_size += dentry->d_name.len * 2;
+		parent_inode->i_mtime = parent_inode->i_ctime = CURRENT_TIME;
 		ret = btrfs_update_inode(trans, root,
 					 dentry->d_parent->d_inode);
 	}