This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - gfs2: don't swab in place
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 14 May 2009 08:24:17 +0000 (UTC)
- Subject: cluster: STABLE3 - gfs2: don't swab in place
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=27ea39325fcfd4200ac6a18eea78452e26818566
Commit: 27ea39325fcfd4200ac6a18eea78452e26818566
Parent: 222a7aa8b36727d11b4485828b0c90a7baddc18d
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Thu May 14 10:21:45 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
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 <fdinitto@redhat.com>
---
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;