summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 13:47:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 13:47:34 -0800
commitad8f76be48d817b48222411ae16a7dfe257bdb24 (patch)
treeb2cc4717aad2ec852ac83b0835eea8cf600f4343 /fs
parentcad8e944364bd84c8c03e8c99e3fffa1cb2fc1ba (diff)
parent988a6490a793b73ff23aa3baf87b337152178e4d (diff)
downloadlinux-ad8f76be48d817b48222411ae16a7dfe257bdb24.tar.gz
linux-ad8f76be48d817b48222411ae16a7dfe257bdb24.tar.bz2
linux-ad8f76be48d817b48222411ae16a7dfe257bdb24.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/namei.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 1abe7343f920..4abbe8604302 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -827,6 +827,7 @@ static int jfs_link(struct dentry *old_dentry,
/* update object inode */
ip->i_nlink++; /* for new link */
ip->i_ctime = CURRENT_TIME;
+ dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(dir);
atomic_inc(&ip->i_count);
@@ -1024,6 +1025,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
insert_inode_hash(ip);
mark_inode_dirty(ip);
+ dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+ mark_inode_dirty(dip);
/*
* commit update of parent directory and link object
*/