From 61efd8d53baf7189700337ec8c5e5f59902a19b2 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Fri, 14 Jun 2013 08:39:18 -0400
Subject: [PATCH] --- yaml --- r: 377649 b: refs/heads/master c:
 512cbf02fde42b747c5752f135afd3f3f6d598e2 h: refs/heads/master i:   377647:
 4749006939cc133d2dcf59372d7ef4108f993249 v: v3

---
 [refs]              | 2 +-
 trunk/fs/gfs2/dir.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c0c9b073d4b1..6daabe3f749a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d4ade986f9c8df31e68fd30643997f79cc5a5f8
+refs/heads/master: 512cbf02fde42b747c5752f135afd3f3f6d598e2
diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c
index f0c70529948f..147fcc557299 100644
--- a/trunk/fs/gfs2/dir.c
+++ b/trunk/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;