From cb040c9c1bc59be6063692ce7171458e5cd42945 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Nov 2011 09:48:08 -0800
Subject: [PATCH] --- yaml --- r: 275754 b: refs/heads/master c:
 774ac21da76f5c3018428725074e27a3fd40b128 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e2d988a6879d..1fdf4c737c87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15a2015fbc692e1c97d7ce12d96e077f5ae7ea6d
+refs/heads/master: 774ac21da76f5c3018428725074e27a3fd40b128
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 2abd0dfad7f8..bca3948e9dbf 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -1143,7 +1143,7 @@ static void ceph_d_prune(struct dentry *dentry)
 {
 	struct ceph_dentry_info *di;
 
-	dout("d_release %p\n", dentry);
+	dout("ceph_d_prune %p\n", dentry);
 
 	/* do we have a valid parent? */
 	if (!dentry->d_parent || IS_ROOT(dentry))
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index a90846fac759..8dc73a594a90 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -638,10 +638,12 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc,
 	if (err == 0) {
 		dout("open_root_inode success\n");
 		if (ceph_ino(req->r_target_inode) == CEPH_INO_ROOT &&
-		    fsc->sb->s_root == NULL)
+		    fsc->sb->s_root == NULL) {
 			root = d_alloc_root(req->r_target_inode);
-		else
+			ceph_init_dentry(root);
+		} else {
 			root = d_obtain_alias(req->r_target_inode);
+		}
 		req->r_target_inode = NULL;
 		dout("open_root_inode success, root dentry is %p\n", root);
 	} else {