leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Clean up inotify delete race fix

Browse Source 
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>
This commit is contained in:
John McCutchan 2005-08-04 21:12:54 -04:00 committed by Linus Torvalds
parent f10eff2683
commit 0c3dba1534
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/namei.c
View File

@ -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;

4
include/linux/fsnotify.h
View File

@ -46,10 +46,8 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
/*
* fsnotify_unlink - file was unlinked
*/
static inline void fsnotify_unlink(struct dentry *dentry, struct inode *dir)
static inline void fsnotify_unlink(struct dentry *dentry, struct inode *inode, struct inode *dir)
{
struct inode *inode = dentry->d_inode;
inode_dir_notify(dir, DN_DELETE);
inotify_inode_queue_event(dir, IN_DELETE, 0, dentry->d_name.name);
inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);