X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fvolume_id.c;h=ef2b663f6c9a86c18e95d8b8f9fe1e66672b92f2;hb=1893cf588f3d428a35a46030deca4ea54be71320;hp=b247fe2ddbc0211afd165a2f59ae1d108153743c;hpb=0c6ecdfd9f7b7247d8f0258b6cb92aac9eccfb9b;p=elogind.git

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index b247fe2dd..ef2b663f6 100644
--- 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]))
@@ -489,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.
@@ -521,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);