summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorJohn McCutchan <ttb@tentacle.dhs.org>2005-08-04 21:12:54 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-04 21:37:39 -0700
commit0c3dba1534569734ba353afdf3f11def497ff2ac (patch)
treeec52740643c710072aab5122e96851c63ed049a0 /fs/namei.c
parentf10eff26831159f52353e8f15c37cdb2935d5fbf (diff)
downloadlinux-0c3dba1534569734ba353afdf3f11def497ff2ac.tar.bz2
[PATCH] Clean up inotify delete race fix
This avoids the whole #ifdef mess by just getting a copy of dentry->d_inode before d_delete is called - that makes the codepaths the same for the INOTIFY/DNOTIFY cases as for the regular no-notify case. I've been running this under a Gnome session for the last 10 minutes. Inotify is being used extensively. Signed-off-by: John McCutchan <ttb@tentacle.dhs.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 83559dce4286..32accb6a672f 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;