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

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

[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: default avatarJohn McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f10eff26

fs/namei.c

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

		d_delete(dentry);

		fsnotify_unlink(dentry, dir);

		dput(dentry);

#else

		struct inode *inode = dentry->d_inode;

		d_delete(dentry);

#endif

		fsnotify_unlink(dentry, inode, dir);

	}



	return error;

include/linux/fsnotify.h

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