From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3888 invoked by alias); 14 May 2009 08:28:35 -0000 Received: (qmail 3882 invoked by alias); 14 May 2009 08:28:35 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 - gfs: don't swab in place 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: b20995d81eb22f7c8ace0e282318afae48f24508 X-Git-Newrev: f190150c52fad148fa164775fe6317941a6a2f47 From: "Fabio M. Di Nitto" Message-Id: <20090514082807.9F179120366@lists.fedorahosted.org> Date: Thu, 14 May 2009 08: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/msg00322.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=f190150c52fad148fa164775fe6317941a6a2f47 Commit: f190150c52fad148fa164775fe6317941a6a2f47 Parent: b20995d81eb22f7c8ace0e282318afae48f24508 Author: Fabio M. Di Nitto AuthorDate: Thu May 14 10:21:45 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Thu May 14 10:27:57 2009 +0200 gfs: don't swab in place because of the way gfs buffers work, it's not safe to swab in place. Signed-off-by: Fabio M. Di Nitto --- gfs/gfs_fsck/pass1c.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gfs/gfs_fsck/pass1c.c b/gfs/gfs_fsck/pass1c.c index afe4a21..f1918cb 100644 --- a/gfs/gfs_fsck/pass1c.c +++ b/gfs/gfs_fsck/pass1c.c @@ -15,11 +15,14 @@ static int remove_eattr_entry(struct fsck_sb *sdp, osi_buf_t *leaf_bh, if(!prev){ curr->ea_type = GFS_EATYPE_UNUSED; } else { - curr->ea_rec_len = gfs32_to_cpu(curr->ea_rec_len); - prev->ea_rec_len = gfs32_to_cpu(prev->ea_rec_len); + uint32_t curr_rec_len; + uint32_t prev_rec_len; + + curr_rec_len = gfs32_to_cpu(curr->ea_rec_len); + prev_rec_len = gfs32_to_cpu(prev->ea_rec_len); prev->ea_rec_len = - cpu_to_gfs32(curr->ea_rec_len + prev->ea_rec_len); + cpu_to_gfs32(curr_rec_len + prev_rec_len); if (curr->ea_flags & GFS_EAFLAG_LAST) prev->ea_flags |= GFS_EAFLAG_LAST; }