X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fgfs.c;h=e1293ebce724f01e826d75faccd88c32ad42cf39;hb=e5931bb7d86226a3823bdf5f4ec01c857827d386;hp=53382222ac48cd18853cf8a8f87069a8ca460d4c;hpb=c70560feef0eb61a150cd2f956f0beead4313ffe;p=elogind.git

diff --git a/extras/volume_id/lib/gfs.c b/extras/volume_id/lib/gfs.c
index 53382222a..e1293ebce 100644
--- a/extras/volume_id/lib/gfs.c
+++ b/extras/volume_id/lib/gfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 /* Common gfs/gfs2 constants: */
@@ -86,8 +87,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 +102,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;