From 40670e2b871c063eeab09edb379e8747da7436e6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 10 Apr 2006 22:54:31 -0700 Subject: [PATCH] --- yaml --- r: 25531 b: refs/heads/master c: 091e881d0e55496d8887b61446ae1c598b0995b6 h: refs/heads/master i: 25529: 5a76e0108d5b1efe29ba842c15d5d6105b096d4f 25527: f78971d8b21b9c2fa78326ba606db3ec17c681a3 v: v3 --- [refs] | 2 +- trunk/fs/inotify.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); }