From 1bb7e8726d58dfd1680a74d408e4c81ce7ee45d9 Mon Sep 17 00:00:00 2001
From: Denis Cheng <crquan@gmail.com>
Date: Wed, 15 Aug 2007 23:54:44 +0800
Subject: [PATCH] --- yaml --- r: 67663 b: refs/heads/master c:
 34eaae398e29dadeed95efd30f1eb694e5932b34 h: refs/heads/master i:   67661:
 f5ac764d9d18f7eaa3d5b4547a94d92d99301ddf   67659:
 734c2b2cb8900cf616de6e5a196ff0a9dec17b41   67655:
 5296d7879c4a2ffffcd37d7a5c5df63e6a33db24   67647:
 ae00b6a233741cebfac5020b6479b7bc753d2c8f v: v3

---
 [refs]                     | 2 +-
 trunk/fs/gfs2/ops_fstype.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e22f815061ca..aecaa766a329 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fd5355470ea40355b8af76d01748ec7b9926d4d
+refs/heads/master: 34eaae398e29dadeed95efd30f1eb694e5932b34
diff --git a/trunk/fs/gfs2/ops_fstype.c b/trunk/fs/gfs2/ops_fstype.c
index 6c820cb23473..c1c6672ebb83 100644
--- a/trunk/fs/gfs2/ops_fstype.c
+++ b/trunk/fs/gfs2/ops_fstype.c
@@ -292,8 +292,9 @@ static int init_sb(struct gfs2_sbd *sdp, int silent, int undo)
 		fs_err(sdp, "can't get root dentry\n");
 		error = -ENOMEM;
 		iput(inode);
-	}
-	sb->s_root->d_op = &gfs2_dops;
+	} else
+		sb->s_root->d_op = &gfs2_dops;
+	
 out:
 	gfs2_glock_dq_uninit(&sb_gh);
 	return error;