From 43fd3309d342e936acaaf7dbdf314585f26893b0 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 10 Mar 2011 03:44:05 -0500
Subject: [PATCH] --- yaml --- r: 234033 b: refs/heads/master c:
 0eb980e31770cfeff6e27760b4692d595b8dbf28 h: refs/heads/master i:   234031:
 042adce7c59a05c74d0dae7ed41c6e621f3059f9 v: v3

---
 [refs]              | 2 +-
 trunk/fs/ceph/dir.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36e778ae1776..d7c1b1da311f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c78f4cc5e7d642c7009089817c12d8984e7ba872
+refs/heads/master: 0eb980e31770cfeff6e27760b4692d595b8dbf28
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 099a58615b90..ebafa65a29b6 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -993,7 +993,7 @@ static int ceph_d_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
 	struct inode *dir;
 
-	if (nd->flags & LOOKUP_RCU)
+	if (nd && nd->flags & LOOKUP_RCU)
 		return -ECHILD;
 
 	dir = dentry->d_parent->d_inode;