Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75449536 authored by John McCutchan's avatar John McCutchan Committed by Linus Torvalds
Browse files

[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: default avatarJohn McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: default avatarRobert Love <rml@novell.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be2ac68f

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	if (!error) {

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

include/linux/fsnotify.h

+6 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 */

static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,

				 const char *old_name, const char *new_name,

				 int isdir)

				 int isdir, struct inode *target)

{

	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;

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



	if (target) {

		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);

		inotify_inode_is_dead(target);

	}

}



/*