[Cluster-devel] Re: [PATCH] gfs2: fixed a NULL pointer assignment BUG

[Steven Whitehouse]

Hi,

Now in the GFS2 -nmw git tree. Thanks,

Steve.

On Wed, 2007-08-15 at 23:54 +0800, Denis Cheng wrote:
> Signed-off-by: Denis Cheng <crquan at gmail.com>
> ---
>  fs/gfs2/ops_fstype.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
> index cf5aa50..67e2d43 100644
> --- a/fs/gfs2/ops_fstype.c
> +++ b/fs/gfs2/ops_fstype.c
> @@ -301,8 +301,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;