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
This commit is contained in:
Linus Torvalds 2009-06-29 13:09:39 -07:00
commit aa221cb617

View File

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