From d7ceef3e66ccc06001b99513a98ccaabe21862a0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Dec 2010 09:53:41 -0800
Subject: [PATCH] --- yaml --- r: 223487 b: refs/heads/master c:
 92cf765237e2787eb168096305c448caf25ac7f8 h: refs/heads/master i:   223485:
 7c0a1ef09e88a9919642bc9db18f476f668a6800   223483:
 66365b07c6751627aaf6e95818ce7b40a0d8b1c3   223479:
 d29360e49ebd178fad7ee935e77329fbe8363a29   223471:
 545fccc4ddc32070ada27bd14519965a9f5a3aba   223455:
 2355060197f0d4bad2fdc16ca667b6fc8574766a   223423:
 31c8376b6976d6e6af8d4aa01dfaf8fd86502976   223359:
 02f68c9debea62c5de0f6e4f8cb40e71d398db19   223231:
 3ba73eb2000ab1125a2db6928387f373e6c946b0 v: v3

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

diff --git a/[refs] b/[refs]
index eae3e233bc8b..cd52cbbb5524 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab226e21ad34f6ef52e00d2ab399d2364b4cdfee
+refs/heads/master: 92cf765237e2787eb168096305c448caf25ac7f8
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 158c700fdca5..d902948a90d8 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -40,7 +40,8 @@ int ceph_init_dentry(struct dentry *dentry)
 	if (dentry->d_fsdata)
 		return 0;
 
-	if (ceph_snap(dentry->d_parent->d_inode) == CEPH_NOSNAP)
+	if (dentry->d_parent == NULL ||   /* nfs fh_to_dentry */
+	    ceph_snap(dentry->d_parent->d_inode) == CEPH_NOSNAP)
 		dentry->d_op = &ceph_dentry_ops;
 	else if (ceph_snap(dentry->d_parent->d_inode) == CEPH_SNAPDIR)
 		dentry->d_op = &ceph_snapdir_dentry_ops;