---

yaml --- r: 25531 b: refs/heads/master c: 091e881 h: refs/heads/master i: 25529: 5a76e01 25527: f78971d v: v3
git-mirror · Apr 11, 2006 · 40670e2 · 40670e2
1 parent 5698fa5
commit 40670e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68250ba5df4c9d00d3064a0ba9a894035436916b
+refs/heads/master: 091e881d0e55496d8887b61446ae1c598b0995b6
diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c
@@ -538,7 +538,7 @@ void inotify_d_instantiate(struct dentry *entry, struct inode *inode)
 	WARN_ON(entry->d_flags & DCACHE_INOTIFY_PARENT_WATCHED);
 	spin_lock(&entry->d_lock);
 	parent = entry->d_parent;
-	if (inotify_inode_watched(parent->d_inode))
+	if (parent->d_inode && inotify_inode_watched(parent->d_inode))
 		entry->d_flags |= DCACHE_INOTIFY_PARENT_WATCHED;
 	spin_unlock(&entry->d_lock);
 }