libudev: libudev.pc add Libs.private

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

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index baeaa9f74e0def5d444ee63747b8fbfc92616f2d..ef2b663f6c9a86c18e95d8b8f9fe1e66672b92f2 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -77,6 +78,7 @@ static const struct prober prober_filesystem[] = {
        { volume_id_probe_vxfs, { "vxfs", } },
        { volume_id_probe_squashfs, { "squashfs", } },
        { volume_id_probe_netware, { "netware", } },
+       { volume_id_probe_oracleasm, { "oracleasm", } },
 };
 
 /* the user can overwrite this log function */
@@ -488,27 +490,6 @@ struct volume_id *volume_id_open_fd(int fd)
        return id;
 }
 
-struct volume_id *volume_id_open_node(const char *path)
-{
-       struct volume_id *id;
-       int fd;
-
-       fd = open(path, O_RDONLY);
-       if (fd < 0) {
-               dbg("unable to open '%s'\n", path);
-               return NULL;
-       }
-
-       id = volume_id_open_fd(fd);
-       if (id == NULL)
-               return NULL;
-
-       /* close fd on device close */
-       id->fd_close = 1;
-
-       return id;
-}
-
 /**
  * volume_id_close:
  * @id: Probing context.
@@ -520,9 +501,6 @@ void volume_id_close(struct volume_id *id)
        if (id == NULL)
                return;
 
-       if (id->fd_close != 0)
-               close(id->fd);
-
        volume_id_free_buffer(id);
 
        free(id);