From: Denis Cheng <crquan@gmail.com>
Date: Wed, 15 Aug 2007 15:54:44 +0000 (+0800)
Subject: [GFS2] fixed a NULL pointer assignment BUG
X-Git-Tag: v2.6.24-rc1~1405^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=34eaae398e29dadeed95efd30f1eb694e5932b34;p=linux-2.6-omap-h63xx.git

[GFS2] fixed a NULL pointer assignment BUG

Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 6c820cb2347..c1c6672ebb8 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/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;