volume_id: better DDF raid detection

[elogind.git] / extras / volume_id / lib / gfs.c

diff --git a/extras/volume_id/lib/gfs.c b/extras/volume_id/lib/gfs.c
index 53382222ac48cd18853cf8a8f87069a8ca460d4c..a8b5080ec4fa8d21abd1b8b9472fd248069d33cd 100644 (file)
--- a/extras/volume_id/lib/gfs.c
+++ b/extras/volume_id/lib/gfs.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2006 Red Hat, Inc. <redhat.com>
  *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,7 +29,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 /* Common gfs/gfs2 constants: */
 #define GFS_MAGIC              0x01161970
@@ -86,8 +91,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 +106,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;