SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

volume_id: enable GFS probing code, add LABEL support

Browse Source 
* 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>
This commit is contained in:
Karel Zak
2008-05-28 20:07:17 +02:00
committed by Kay Sievers
parent bbf1599bb5
commit 2f2f54c514
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/volume_id/README
+1 -1
View File
@@ -40,7 +40,7 @@ minix * - - *
ocfs (1, 2) * * * *
vxfs * - - *
nss (netware) * * *
gfs, gfs2 * - - -
gfs, gfs2 * * - -
Raid members are detected to prevent the probing for a filesystem
-----------------------------------------------------------------
extras/volume_id/lib/gfs.c
+8 -2
View File
@@ -86,8 +86,7 @@ static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int v
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)
@@ -102,6 +101,13 @@ static int volume_id_probe_gfs_generic(struct volume_id *id, uint64_t off, int v
}
else
return -1;
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;
extras/volume_id/lib/volume_id.c
+2
View File
@@ -70,6 +70,8 @@ static const struct prober prober_filesystem[] = {
{ 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", } },