From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1529 invoked by alias); 10 Jul 2009 16:36:28 -0000 Received: (qmail 1523 invoked by alias); 10 Jul 2009 16:36:28 -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: STABLE2 - 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/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 6f93883fe128c365ced47d78838213d62c61a7eb X-Git-Newrev: 8956c953c63ff8d4b3c3cb8719a739862e21beb1 From: Bob Peterson Message-Id: <20090710163605.CAAC31201D8@lists.fedorahosted.org> Date: Fri, 10 Jul 2009 16:36: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/msg00040.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8956c953c63ff8d4b3c3cb8719a739862e21beb1 Commit: 8956c953c63ff8d4b3c3cb8719a739862e21beb1 Parent: 6f93883fe128c365ced47d78838213d62c61a7eb Author: Bob Peterson AuthorDate: Fri Jul 10 11:36:20 2009 -0500 Committer: Bob Peterson CommitterDate: Fri Jul 10 11:36:20 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 69a2caf..99104ea 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -568,9 +568,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;