diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 13:03:06 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 13:03:06 -0400 |
| commit | e872d4cace8681838e8d18d52c92f4870e980a08 (patch) | |
| tree | 082b75cc52935efae68f9f744bc3f8807f7176c6 /fs/namei.c | |
| parent | 1f3a730117ceda2a7c917d687921fe3c82283968 (diff) | |
| parent | 403fe5ae57c831968c3dbbaba291ae825a1c5aaa (diff) | |
Merge ../from-linus
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index 83559dce428..32accb6a672 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1874,14 +1874,9 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) /* We don't d_delete() NFS sillyrenamed files--they still exist. */ if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) { -#if defined(CONFIG_INOTIFY) || defined(CONFIG_DNOTIFY) - dget(dentry); + struct inode *inode = dentry->d_inode; d_delete(dentry); - fsnotify_unlink(dentry, dir); - dput(dentry); -#else - d_delete(dentry); -#endif + fsnotify_unlink(dentry, inode, dir); } return error; |