---

yaml --- r: 223487 b: refs/heads/master c: 92cf765 h: refs/heads/master i: 223485: 7c0a1ef 223483: 66365b0 223479: d29360e 223471: 545fccc 223455: 2355060 223423: 31c8376 223359: 02f68c9 223231: 3ba73eb v: v3
git-mirror · Dec 17, 2010 · d7ceef3 · d7ceef3
1 parent 7b205e8
commit d7ceef3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;