volume_id: add Veritas fs

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

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c
index 3fe8562e33590a489b582a69738d2c93ae29c985..06496e7130d86421e698da77200a9cca919d78e2 100644 (file)
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/volume_id/volume_id.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library 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
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     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.
  */
 
 #ifndef _GNU_SOURCE
@@ -35,7 +25,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -69,8 +58,9 @@
 #include "minix.h"
 #include "mac.h"
 #include "msdos.h"
+#include "ocfs.h"
 
-int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned long long size)
+int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 {
        if (id == NULL)
                return -EINVAL;
@@ -118,9 +108,6 @@ int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned l
        if (volume_id_probe_vfat(id, off) == 0)
                goto exit;
 
-       if (volume_id_probe_mac_partition_map(id, off) == 0)
-               goto exit;
-
        if (volume_id_probe_xfs(id, off) == 0)
                goto exit;
 
@@ -169,6 +156,15 @@ int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned l
        if (volume_id_probe_minix(id, off) == 0)
                goto exit;
 
+       if (volume_id_probe_ocfs1(id, off) == 0)
+               goto exit;
+
+       if (volume_id_probe_ocfs2(id, off) == 0)
+               goto exit;
+
+       if (volume_id_probe_vxfs(id, off) == 0)
+               goto exit;
+
        return -1;
 
 exit:
@@ -220,11 +216,11 @@ struct volume_id *volume_id_open_node(const char *path)
 struct volume_id *volume_id_open_dev_t(dev_t devt)
 {
        struct volume_id *id;
-       __u8 tmp_node[VOLUME_ID_PATH_MAX];
+       char tmp_node[VOLUME_ID_PATH_MAX];
 
        snprintf(tmp_node, VOLUME_ID_PATH_MAX,
                 "/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));
-       tmp_node[VOLUME_ID_PATH_MAX] = '\0';
+       tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
 
        /* create tempory node to open the block device */
        unlink(tmp_node);