From add09b4efe5a1bd10f6e38d808d14139a2ab9087 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@dreamhost.com>
Date: Wed, 4 Jan 2012 16:30:15 -0600
Subject: [PATCH] --- yaml --- r: 284449 b: refs/heads/master c:
 d46cfba5363a163851dc768f717f34185527a472 h: refs/heads/master i:   284447:
 42dedbf98f0cc681046426cfb68002b81205a7e4 v: v3

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

diff --git a/[refs] b/[refs]
index 9a2373e97605..4c5431cd7a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56e925b677c5293e5aac73dac09e93b23259f907
+refs/heads/master: d46cfba5363a163851dc768f717f34185527a472
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index b48f15f101a0..ec74313e901f 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -638,12 +638,11 @@ 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);
-			ceph_init_dentry(root);
-		} else {
+		else
 			root = d_obtain_alias(req->r_target_inode);
-		}
+		ceph_init_dentry(root);
 		req->r_target_inode = NULL;
 		dout("open_root_inode success, root dentry is %p\n", root);
 	} else {