[PATCH] inotify: fix file deletion by rename detection
When a file is moved over an existing file that you are watching, inotify won't send you a DELETE_SELF event and it won't unref the inode until the inotify instance is closed by the application. Signed-off-by: John McCutchan <ttb@tentacle.dhs.org> Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
be2ac68f7b
commit
7544953685
2 changed files with 7 additions and 2 deletions
|
@ -2218,7 +2218,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||||
error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
|
error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
const char *new_name = old_dentry->d_name.name;
|
const char *new_name = old_dentry->d_name.name;
|
||||||
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir);
|
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, new_dentry->d_inode);
|
||||||
}
|
}
|
||||||
fsnotify_oldname_free(old_name);
|
fsnotify_oldname_free(old_name);
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
|
static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
|
||||||
const char *old_name, const char *new_name,
|
const char *old_name, const char *new_name,
|
||||||
int isdir)
|
int isdir, struct inode *target)
|
||||||
{
|
{
|
||||||
u32 cookie = inotify_get_cookie();
|
u32 cookie = inotify_get_cookie();
|
||||||
|
|
||||||
|
@ -36,6 +36,11 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
|
||||||
isdir = IN_ISDIR;
|
isdir = IN_ISDIR;
|
||||||
inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
|
inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
|
||||||
inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
|
inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
|
||||||
|
|
||||||
|
if (target) {
|
||||||
|
inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
|
||||||
|
inotify_inode_is_dead(target);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue