From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27872 invoked by alias); 10 Jul 2009 16:25:41 -0000 Received: (qmail 27848 invoked by alias); 10 Jul 2009 16:25:40 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_25,J_CHICKENPOX_62,SPF_HELO_PASS X-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_25,J_CHICKENPOX_62,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs2-utils: master - fsck.gfs2 segfaults while fixing 'EA leaf block type' problem. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d20b0d2be3ddcd30637ddd158de1eee1b12c7710 X-Git-Newrev: 5305e878a987b90caf498f0bc5a92ae7ba8fa57d From: Bob Peterson Message-Id: <20090710162517.88E041201D8@lists.fedorahosted.org> Date: Fri, 10 Jul 2009 16:25:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00038.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=5305e878a987b90caf498f0bc5a92ae7ba8fa57d Commit: 5305e878a987b90caf498f0bc5a92ae7ba8fa57d Parent: d20b0d2be3ddcd30637ddd158de1eee1b12c7710 Author: Bob Peterson AuthorDate: Fri Jul 10 11:15:53 2009 -0500 Committer: Bob Peterson CommitterDate: Fri Jul 10 11:24:57 2009 -0500 fsck.gfs2 segfaults while fixing 'EA leaf block type' problem. bz 510758 This is a gfs2 crosswrite from gfs of commit 8df780b532e02acef7f0ebc0113cf96515a7a3b6 --- gfs2/fsck/metawalk.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 64f98e0..da89c93 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -634,9 +634,10 @@ static int check_leaf_eattr(struct gfs2_inode *ip, uint64_t block, if(error > 0) { return 1; } - error = check_eattr_entries(ip, bh, pass, want_updated); - if (bh) + if (bh) { + error = check_eattr_entries(ip, bh, pass, want_updated); brelse(bh, *want_updated); + } return error; }