diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2013-06-14 08:39:18 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-06-14 13:27:17 +0100 |
| commit | 512cbf02fde42b747c5752f135afd3f3f6d598e2 (patch) | |
| tree | 7c03ec9d076729c3669ba63b620b3efeab399656 /fs/gfs2 | |
| parent | 6d4ade986f9c8df31e68fd30643997f79cc5a5f8 (diff) | |
| download | op-kernel-dev-512cbf02fde42b747c5752f135afd3f3f6d598e2.zip op-kernel-dev-512cbf02fde42b747c5752f135afd3f3f6d598e2.tar.gz | |
GFS2: fix regression in dir_double_exhash
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.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |
