From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2003 invoked by alias); 29 Apr 2009 21:28:49 -0000 Received: (qmail 1997 invoked by alias); 29 Apr 2009 21:28:49 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,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: gfs1-utils: master - Write out changes when fixing EA corruption To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs1-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 086dfd631de4f1afe1280b3dc10ae0ade0a1460a X-Git-Newrev: 520eea1ad1890acdbebdb7fea33d95e4967a0833 From: Bob Peterson Message-Id: <20090429212759.3C4E9120209@lists.fedorahosted.org> Date: Wed, 29 Apr 2009 21:28: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-q2/txt/msg00141.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=520eea1ad1890acdbebdb7fea33d95e4967a0833 Commit: 520eea1ad1890acdbebdb7fea33d95e4967a0833 Parent: 086dfd631de4f1afe1280b3dc10ae0ade0a1460a Author: Bob Peterson AuthorDate: Tue Apr 28 09:27:09 2009 -0500 Committer: Bob Peterson CommitterDate: Tue Apr 28 09:27:09 2009 -0500 Write out changes when fixing EA corruption bz 495774 The previous patch for bz 495774 failed to actually write the changes to disk. This patch adds that ability. --- gfs/gfs_fsck/metawalk.c | 10 +++++----- gfs/gfs_fsck/pass1.c | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gfs/gfs_fsck/metawalk.c b/gfs/gfs_fsck/metawalk.c index b1b1de9..64bd519 100644 --- a/gfs/gfs_fsck/metawalk.c +++ b/gfs/gfs_fsck/metawalk.c @@ -362,6 +362,7 @@ static int check_eattr_entries(struct fsck_inode *ip, osi_buf_t *bh, /* Endianness doesn't matter in this case because it's a single byte. */ + write_buf(sdp, bh, 0); return -1; } log_err("The bad EA was not fixed.\n"); @@ -410,12 +411,11 @@ static int check_leaf_eattr(struct fsck_inode *ip, uint64_t block, relse_buf(ip->i_sbd, bh); return 1; } - } - - check_eattr_entries(ip, bh, pass); + check_eattr_entries(ip, bh, pass); - if (bh) - relse_buf(ip->i_sbd, bh); + if (bh) + relse_buf(ip->i_sbd, bh); + } return 0; } diff --git a/gfs/gfs_fsck/pass1.c b/gfs/gfs_fsck/pass1.c index d5578c9..3768ebf 100644 --- a/gfs/gfs_fsck/pass1.c +++ b/gfs/gfs_fsck/pass1.c @@ -246,6 +246,12 @@ static int clear_eas(struct fsck_inode *ip, struct block_count *bc, return 0; } gfs_dinode_out(&ip->i_di, BH_DATA(dibh)); + if (write_buf(sdp, dibh, 0) < 0) { + stack; + log_crit("Bad EA reference remains.\n"); + } else { + log_warn("Bad EA reference cleared.\n"); + } relse_buf(sdp, dibh); return 1; } else {