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

Commit e6ce3066 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Eric Paris
Browse files

fs: allow d_instantiate to be called with negative parent dentry 



The new fsnotify infrastructure (starting at 90586523) causes an oops in
spufs, where we populate a directory with files before instantiating the
directory itself. The new changes seem to have introduced an assumption
that a dentry's parent will be positive when instantiating.

This change makes it once again possible to d_instantiate a dentry
with a negative parent, and brings __fsnotify_d_instantiate() into
line with inotify_d_instantiate(), which already has this NULL check.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 52989765

include/linux/fsnotify_backend.h

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



	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;

	else

		dentry->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED;