diff --git a/[refs] b/[refs]
index 55ac25fe43f4..b0fa55d3e61d 100644
--- 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
index 367c487c014b..1f50302849c5 100644
--- 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);
 }