---

yaml --- r: 284449 b: refs/heads/master c: d46cfba h: refs/heads/master i: 284447: 42dedbf v: v3
git-mirror · Jan 12, 2012 · add09b4 · add09b4
1 parent af2dd43
commit add09b4
Show file tree

Hide file tree

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