diff options
author | Len Brown <len.brown@intel.com> | 2005-08-15 16:02:50 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-15 16:02:50 -0400 |
commit | fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 (patch) | |
tree | 6e412d032cca4ddb50b8628b4bbecea120d316a7 /fs/namei.c | |
parent | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (diff) | |
parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) |
Merge ../from-linus
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 57046d98a74..b85f158aef0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2216,7 +2216,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry); if (!error) { const char *new_name = old_dentry->d_name.name; - fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, new_dentry->d_inode); + fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, + new_dentry->d_inode, old_dentry->d_inode); } fsnotify_oldname_free(old_name); |