summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-10-10 11:54:46 +0100
committerKay Sievers <kay.sievers@vrfy.org>2008-10-13 03:23:31 +0200
commit2f664629829d8ed52a8bc55b31faf8ec8b65bd3c (patch)
tree07ef693e05f89e2be396d7e3d55c3164e099d597
parent9a997ecf4ed97becb9c546c5fad8490bcba44181 (diff)
volume_id: support for GFS2 UUIDs
-rw-r--r--extras/volume_id/README2
-rw-r--r--extras/volume_id/lib/gfs.c17
2 files changed, 17 insertions, 2 deletions
diff --git a/extras/volume_id/README b/extras/volume_id/README
index 0c5e37f969..44a9a875f3 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -40,7 +40,7 @@ minix * - - *
ocfs (1, 2) * * * *
vxfs * - - *
nss (netware) * * *
-gfs, gfs2 * * - -
+gfs, gfs2 * * * -
oracleasm * * - -
Raid members are detected to prevent the probing for a filesystem
diff --git a/extras/volume_id/lib/gfs.c b/extras/volume_id/lib/gfs.c
index 25f96f668b..d97730c7a4 100644
--- a/extras/volume_id/lib/gfs.c
+++ b/extras/volume_id/lib/gfs.c
@@ -76,9 +76,22 @@ struct gfs2_sb {
char sb_lockproto[GFS_LOCKNAME_LEN];
char sb_locktable[GFS_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 */
+ uint8_t sb_uuid[16]; /* The UUID maybe 0 for backwards compat */
} PACKED;
+static int uuid_non_zero(const uint8_t *p)
+{
+ int i;
+ for (i = 0; i < 16; i++) {
+ if (p[i] != 0)
+ return 1;
+ }
+ return 0;
+}
+
static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int vers)
{
struct gfs2_sb *sbd;
@@ -113,6 +126,8 @@ static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int v
volume_id_set_label_raw(id, label, GFS_LOCKNAME_LEN);
volume_id_set_label_string(id, label, GFS_LOCKNAME_LEN);
}
+ if (vers == 2 && uuid_non_zero(sbd->sb_uuid))
+ volume_id_set_uuid(id, sbd->sb_uuid, 0, UUID_DCE);
strcpy(id->type_version, "1");
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
return 0;