summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-09-22 07:29:31 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2008-09-22 07:29:31 +0100
commit6d80c39f9155e289fe8037a8b6352931ff916ceb (patch)
tree796deb75d25c7e7afc78092ee6b0f3a884fece87
parent719ee344675c2efed9115934f19aa66a526b6e5b (diff)
downloadlinux-3.10-6d80c39f9155e289fe8037a8b6352931ff916ceb.tar.gz
linux-3.10-6d80c39f9155e289fe8037a8b6352931ff916ceb.tar.bz2
linux-3.10-6d80c39f9155e289fe8037a8b6352931ff916ceb.zip
GFS2: Add UUID to GFS2 sb
This patch adds a UUID to the GFS2 sb structure. This field is not actually referenced from kernel space at all, but is added for completeness and due to the userland tools which get their on-disk structure information from the gfs2_ondisk.h header file. Since we have to be backwards compatible, we will assume that any GFS2 sb for which the UUID is all 0 does not have a UUID as such. We should then be (after some userland changes) able to support the -U mount option. This addresses Fedora bugzilla #242689 Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--include/linux/gfs2_ondisk.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index c3c19f926e6..14d0df0b574 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -118,7 +118,11 @@ struct gfs2_sb {
char sb_lockproto[GFS2_LOCKNAME_LEN];
char sb_locktable[GFS2_LOCKNAME_LEN];
- /* In gfs1, quota and license dinodes followed */
+
+ struct gfs2_inum __pad3; /* Was quota inode in gfs1 */
+ struct gfs2_inum __pad4; /* Was licence inode in gfs1 */
+#define GFS2_HAS_UUID 1
+ __u8 sb_uuid[16]; /* The UUID, maybe 0 for backwards compat */
};
/*