* enables GFS/GFS2 probing code (it's disabled now!)
* adds support for LABELs -- it seems that locktable name is usable as
a LABEL (at least according to libblkid).
* removes extra check of sb_header.mh_format -- nothing in kernel and
blkid checks this superblock entry. It seems that check GFS_MAGIC and
GFS_METATYPE_SB is enough.
Signed-off-by: Karel Zak <kzak@redhat.com>
ocfs (1, 2) * * * *
vxfs * - - *
nss (netware) * * *
ocfs (1, 2) * * * *
vxfs * - - *
nss (netware) * * *
Raid members are detected to prevent the probing for a filesystem
-----------------------------------------------------------------
Raid members are detected to prevent the probing for a filesystem
-----------------------------------------------------------------
return -1;
if (be32_to_cpu(sbd->sb_header.mh_magic) == GFS_MAGIC &&
return -1;
if (be32_to_cpu(sbd->sb_header.mh_magic) == GFS_MAGIC &&
- be32_to_cpu(sbd->sb_header.mh_type) == GFS_METATYPE_SB &&
- be32_to_cpu(sbd->sb_header.mh_format) == GFS_FORMAT_SB) {
+ be32_to_cpu(sbd->sb_header.mh_type) == GFS_METATYPE_SB) {
if (vers == 1) {
if (be32_to_cpu(sbd->sb_fs_format) != GFS_FORMAT_FS ||
be32_to_cpu(sbd->sb_multihost_format) != GFS_FORMAT_MULTI)
if (vers == 1) {
if (be32_to_cpu(sbd->sb_fs_format) != GFS_FORMAT_FS ||
be32_to_cpu(sbd->sb_multihost_format) != GFS_FORMAT_MULTI)
+
+ if (strlen(sbd->sb_locktable)) {
+ uint8_t *label = (uint8_t *) sbd->sb_locktable;
+
+ volume_id_set_label_raw(id, label, GFS_LOCKNAME_LEN);
+ volume_id_set_label_string(id, label, GFS_LOCKNAME_LEN);
+ }
strcpy(id->type_version, "1");
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
return 0;
strcpy(id->type_version, "1");
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
return 0;
{ volume_id_probe_hpfs, { "hpfs", } },
{ volume_id_probe_sysv, { "sysv", "xenix", } },
{ volume_id_probe_minix, { "minix", } },
{ volume_id_probe_hpfs, { "hpfs", } },
{ volume_id_probe_sysv, { "sysv", "xenix", } },
{ volume_id_probe_minix, { "minix", } },
+ { volume_id_probe_gfs, { "gfs", } },
+ { volume_id_probe_gfs2, { "gfs2", } },
{ volume_id_probe_ocfs1, { "ocfs1", } },
{ volume_id_probe_ocfs2, { "ocfs2", } },
{ volume_id_probe_vxfs, { "vxfs", } },
{ volume_id_probe_ocfs1, { "ocfs1", } },
{ volume_id_probe_ocfs2, { "ocfs2", } },
{ volume_id_probe_vxfs, { "vxfs", } },