From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 694 invoked by alias); 14 May 2009 08:24:48 -0000 Received: (qmail 685 invoked by alias); 14 May 2009 08:24:48 -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: cluster: STABLE3 - gfs2: don't swab in place To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 222a7aa8b36727d11b4485828b0c90a7baddc18d X-Git-Newrev: 27ea39325fcfd4200ac6a18eea78452e26818566 From: "Fabio M. Di Nitto" Message-Id: <20090514082417.85D1F120366@lists.fedorahosted.org> Date: Thu, 14 May 2009 08:24: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/msg00320.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=27ea39325fcfd4200ac6a18eea78452e26818566 Commit: 27ea39325fcfd4200ac6a18eea78452e26818566 Parent: 222a7aa8b36727d11b4485828b0c90a7baddc18d Author: Fabio M. Di Nitto AuthorDate: Thu May 14 10:21:45 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Thu May 14 10:21:45 2009 +0200 gfs2: don't swab in place because of the way libgfs2 buffers work, it's not safe to swab in place. Signed-off-by: Fabio M. Di Nitto --- gfs2/libgfs2/fs_ops.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c index 0799c03..633ca9e 100644 --- a/gfs2/libgfs2/fs_ops.c +++ b/gfs2/libgfs2/fs_ops.c @@ -666,6 +666,7 @@ static int dirent_alloc(struct gfs2_inode *dip, struct gfs2_buffer_head *bh, do { uint16_t cur_rec_len; uint16_t cur_name_len; + uint16_t new_rec_len; cur_rec_len = be16_to_cpu(dent->de_rec_len); cur_name_len = be16_to_cpu(dent->de_name_len); @@ -682,8 +683,8 @@ static int dirent_alloc(struct gfs2_inode *dip, struct gfs2_buffer_head *bh, GFS2_DIRENT_SIZE(cur_name_len)); new->de_name_len = cpu_to_be16(name_len); - new->de_rec_len = be16_to_cpu(new->de_rec_len); - dent->de_rec_len = cpu_to_be16(cur_rec_len - new->de_rec_len); + new_rec_len = be16_to_cpu(new->de_rec_len); + dent->de_rec_len = cpu_to_be16(cur_rec_len - new_rec_len); *dent_out = new; return 0;