summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-30 00:09:39 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-30 00:09:39 +0400
commitaa221cb61792b941234ab458020c93ed97810161 (patch)
tree4368ad1be411b1e15e9b1770456c7b3095aef700 /include
parent2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (diff)
parente6ce3066010a21bde961d8f8cefe0b69cae78a0f (diff)
downloadlinux-aa221cb61792b941234ab458020c93ed97810161.tar.xz
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
Diffstat (limited to 'include')
-rw-r--r--include/linux/fsnotify_backend.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 44848aa830dc..6c3de999fb34 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -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;