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

Commit aa221cb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify 

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  fs: allow d_instantiate to be called with negative parent dentry
parents 2bfdd79e e6ce3066

include/linux/fsnotify_backend.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ static inline void __fsnotify_update_dcache_flags(struct dentry *dentry) 
	assert_spin_locked(&dentry->d_lock);

	assert_spin_locked(&dentry->d_lock);





	parent = dentry->d_parent;

	parent = dentry->d_parent;

	if (fsnotify_inode_watches_children(parent->d_inode))

	if (parent->d_inode && fsnotify_inode_watches_children(parent->d_inode))

		dentry->d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;

		dentry->d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;

	else

	else

		dentry->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED;

		dentry->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED;