summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDenis Cheng <crquan@gmail.com>2007-08-15 23:54:44 +0800
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 08:55:24 +0100
commit34eaae398e29dadeed95efd30f1eb694e5932b34 (patch)
treed5484d7a8d7530027deadcc0cb869fc6e0afdb2c /fs
parent0fd5355470ea40355b8af76d01748ec7b9926d4d (diff)
[GFS2] fixed a NULL pointer assignment BUG
Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/ops_fstype.c5
1 files changed, 3 insertions, 2 deletions
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;