Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 512cbf02 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: fix regression in dir_double_exhash 



Recent commit e8830d88 introduced a bug in function dir_double_exhash;
it was failing to set h in the fall-back case. This patch corrects it.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 6d4ade98

fs/gfs2/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -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;