diff options
| author | John McCutchan <ttb@tentacle.dhs.org> | 2005-08-04 21:12:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 21:37:39 -0700 |
| commit | 0c3dba1534569734ba353afdf3f11def497ff2ac (patch) | |
| tree | ec52740643c710072aab5122e96851c63ed049a0 /include/linux/fsnotify.h | |
| parent | f10eff26831159f52353e8f15c37cdb2935d5fbf (diff) | |
| download | linux-0c3dba1534569734ba353afdf3f11def497ff2ac.tar.gz linux-0c3dba1534569734ba353afdf3f11def497ff2ac.tar.bz2 linux-0c3dba1534569734ba353afdf3f11def497ff2ac.zip | |
[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 'include/linux/fsnotify.h')
| -rw-r--r-- | include/linux/fsnotify.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index e96a4306ab3b..1cb4935348d8 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -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); |