[Cluster-devel] cluster/group/gfs_controld plock.c

[teigland]

CVSROOT:        /cvs/cluster
Module name:    cluster
Branch:         RHEL5
Changes by:     [EMAIL PROTECTED]       2008-01-21 20:17:44

Modified files:
        group/gfs_controld: plock.c 

Log message:
        bz 429546
        
        Fix an alignment problem with ppc64.  Things work if we do the
        byte-swapping on the original structure and then copy it into the
        final buffer, instead of copying first and then trying to do the
        byte-swapping at an offset within the send buffer.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.25.2.8&r2=1.25.2.9

--- cluster/group/gfs_controld/plock.c  2007/12/05 22:11:32     1.25.2.8
+++ cluster/group/gfs_controld/plock.c  2008/01/21 20:17:44     1.25.2.9
@@ -1044,13 +1044,14 @@
        }
        memset(buf, 0, len);
 
+       info_bswap_out(in);
+
        hd = (struct gdlm_header *)buf;
        hd->type = msg_type;
        hd->nodeid = our_nodeid;
        hd->to_nodeid = 0;
 
        memcpy(buf + sizeof(struct gdlm_header), in, sizeof(*in));
-       info_bswap_out((struct gdlm_plock_info *) buf + sizeof(*hd));
 
        rv = send_group_message(mg, len, buf);