Skip to content

L
linux-davinci-2.6.23
Commit ad8f76be authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

parents cad8e944 988a6490
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
fs/jfs/namei.c
View file @ ad8f76be
...@@ -827,6 +827,7 @@ static int jfs_link(struct dentry *old_dentry, ...@@ -827,6 +827,7 @@ static int jfs_link(struct dentry *old_dentry,
/* update object inode */ /* update object inode */
ip->i_nlink++; /* for new link */ ip->i_nlink++; /* for new link */
ip->i_ctime = CURRENT_TIME; ip->i_ctime = CURRENT_TIME;
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(dir); mark_inode_dirty(dir);
atomic_inc(&ip->i_count); atomic_inc(&ip->i_count);
...@@ -1024,6 +1025,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, ...@@ -1024,6 +1025,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
insert_inode_hash(ip); insert_inode_hash(ip);
mark_inode_dirty(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 * commit update of parent directory and link object
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment