From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8188 invoked by alias); 14 Jul 2009 15:41:02 -0000 Received: (qmail 8182 invoked by alias); 14 Jul 2009 15:41:01 -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: cluster: RHEL5 - fsck.gfs2 segfaults while fixing 'EA leaf block type' problem. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 9913f8ed7bf92f7e4ad306dd65c3b2ec7e815818 X-Git-Newrev: c4344d672a442a24a176706ab3be71f8098dc33e From: Bob Peterson Message-Id: <20090714154035.C499D120109@lists.fedorahosted.org> Date: Tue, 14 Jul 2009 15:41: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/msg00050.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c4344d672a442a24a176706ab3be71f8098dc33e Commit: c4344d672a442a24a176706ab3be71f8098dc33e Parent: 9913f8ed7bf92f7e4ad306dd65c3b2ec7e815818 Author: Bob Peterson AuthorDate: Tue Jul 14 10:40:03 2009 -0500 Committer: Bob Peterson CommitterDate: Tue Jul 14 10:40:03 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 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 7c0570e..0730835 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -580,9 +580,11 @@ static int check_leaf_eattr(struct gfs2_inode *ip, uint64_t block, if(error > 0) { return 1; } - 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; } return 0;