volume_id: don't probe for mac_partition_maps

[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 8e944be0b12cf9116c97fc19275d810bc6da6931..32b91e65ca05397fe1675319abd479fa75b0190c 100644 (file)
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/volume_id/volume_id.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -71,7 +70,7 @@
 #include "msdos.h"
 #include "ocfs2.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;
@@ -119,9 +118,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;
 
@@ -224,11 +220,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);