mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@redhat.com>
To: linux-kernel@vger.kernel.org, cluster-devel@redhat.com
Cc: Bob Peterson <rpeterso@redhat.com>,
	Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH 08/12] GFS2: fix regression in dir_double_exhash
Date: Mon,  1 Jul 2013 10:33:11 +0100	[thread overview]
Message-ID: <1372671195-3472-9-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1372671195-3472-1-git-send-email-swhiteho@redhat.com>

From: Bob Peterson <rpeterso@redhat.com>

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>

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;
-- 
1.7.4


  parent reply	other threads:[~2013-07-01 10:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-01  9:33 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2013-07-01  9:33 ` [PATCH 01/12] GFS2: Sort buffer lists by inplace block number Steven Whitehouse
2013-07-01  9:33 ` [PATCH 02/12] GFS2: Eliminate gfs2_rg_lops Steven Whitehouse
2013-07-01  9:33 ` [PATCH 03/12] GFS2: Cocci spatch "ptr_ret.spatch" Steven Whitehouse
2013-07-01  9:33 ` [PATCH 04/12] GFS2: Remove no-op wrapper function Steven Whitehouse
2013-07-01  9:33 ` [PATCH 05/12] GFS2: fix error propagation in init_threads() Steven Whitehouse
2013-07-01  9:33 ` [PATCH 06/12] GFS2: Only do one directory search on create Steven Whitehouse
2013-07-01  9:33 ` [PATCH 07/12] GFS2: Add atomic_open support Steven Whitehouse
2013-07-01  9:33 ` Steven Whitehouse [this message]
2013-07-01  9:33 ` [PATCH 09/12] GFS2: aggressively issue revokes in gfs2_log_flush Steven Whitehouse
2013-07-01  9:33 ` [PATCH 10/12] GFS2: fix warning message Steven Whitehouse
2013-07-01  9:33 ` [PATCH 11/12] GFS2: Fix fstrim boundary conditions Steven Whitehouse
2013-07-01  9:33 ` [PATCH 12/12] GFS2: Reserve journal space for quota change in do_grow Steven Whitehouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372671195-3472-9-git-send-email-swhiteho@redhat.com \
    --to=swhiteho@redhat.com \
    --cc=cluster-devel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rpeterso@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®