git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GFS2: Tag all metadata with jid
[safe/jmp/linux-2.6]
/
include
/
linux
/
gfs2_ondisk.h
diff --git
a/include/linux/gfs2_ondisk.h
b/include/linux/gfs2_ondisk.h
index
b80c88d
..
81f90a5
100644
(file)
--- 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 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;
+ };
};
/*
};
/*