X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Flinux%2Fgfs2_ondisk.h;h=81f90a59cda6d6ffd347cdc6757b5c4e98dfcc14;hb=0ab7d13fcbd7ce1658c563e345990ba453719deb;hp=b80c88dedbbb419a6e93792b601e496f7470ba50;hpb=2c77634965ee28c8b4790ffb5e83dd5ff7ac8988;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index b80c88d..81f90a5 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -81,7 +81,11 @@ struct gfs2_meta_header {
 	__be32 mh_type;
 	__be64 __pad0;		/* Was generation number in gfs1 */
 	__be32 mh_format;
-	__be32 __pad1;		/* Was incarnation number in gfs1 */
+	/* This union is to keep userspace happy */
+	union {
+		__be32 mh_jid;		/* Was incarnation number in gfs1 */
+		__be32 __pad1;
+	};
 };
 
 /*