[Cluster-devel] [GFS2 PATCH] GFS2: fix regression in dir_double_exhash

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

Looks good. I'll push this to the -nmw tree shortly,

Steve.

On Fri, 2013-06-14 at 08:39 -0400, Bob Peterson wrote:
> Hi,
> 
> Recent commit e8830d8 introduced a bug in function dir_double_exhash;
> it was failing to set h in the fall-back case. This patch corrects it.
> 
> Regards,
> 
> Bob Peterson
> Red Hat File Systems
> 
> Signed-off-by: Bob Peterson <rpeterso@redhat.com> 
> ---
>  fs/gfs2/dir.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
> index f0c7052..147fcc5 100644
> --- a/fs/gfs2/dir.c
> +++ b/fs/gfs2/dir.c
> @@ -1125,13 +1125,14 @@ static int dir_double_exhash(struct gfs2_inode *dip)
>  	if (IS_ERR(hc))
>  		return PTR_ERR(hc);
>  
> -	h = hc2 = kmalloc(hsize_bytes * 2, GFP_NOFS | __GFP_NOWARN);
> +	hc2 = kmalloc(hsize_bytes * 2, GFP_NOFS | __GFP_NOWARN);
>  	if (hc2 == NULL)
>  		hc2 = __vmalloc(hsize_bytes * 2, GFP_NOFS, PAGE_KERNEL);
>  
>  	if (!hc2)
>  		return -ENOMEM;
>  
> +	h = hc2;
>  	error = gfs2_meta_inode_buffer(dip, &dibh);
>  	if (error)
>  		goto out_kfree;
>