X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fvolume_id.c;fp=extras%2Fvolume_id%2Fvolume_id%2Fvolume_id.c;h=09d1e317257f66b9bc7291b2ae3f8201feaa3b5a;hp=b92269863fa0a499acbfd5e794272e86c3cf3fc5;hb=accff726856a0b3258a413d823a534f4f437e6b2;hpb=09c2bab517c58d9447660a9584822c8de6b641f0

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/libvolume_id/volume_id.c
similarity index 78%
rename from extras/volume_id/volume_id/volume_id.c
rename to extras/volume_id/libvolume_id/volume_id.c
index b92269863..09d1e3172 100644
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/libvolume_id/volume_id.c
@@ -30,36 +30,6 @@
 #include "logging.h"
 #include "util.h"
 
-#include "ext.h"
-#include "reiserfs.h"
-#include "fat.h"
-#include "hfs.h"
-#include "jfs.h"
-#include "xfs.h"
-#include "ufs.h"
-#include "ntfs.h"
-#include "iso9660.h"
-#include "udf.h"
-#include "highpoint.h"
-#include "isw_raid.h"
-#include "lsi_raid.h"
-#include "via_raid.h"
-#include "silicon_raid.h"
-#include "nvidia_raid.h"
-#include "promise_raid.h"
-#include "luks.h"
-#include "linux_swap.h"
-#include "linux_raid.h"
-#include "lvm.h"
-#include "cramfs.h"
-#include "hpfs.h"
-#include "romfs.h"
-#include "sysv.h"
-#include "minix.h"
-#include "mac.h"
-#include "msdos.h"
-#include "ocfs.h"
-#include "vxfs.h"
 
 int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 {
@@ -213,28 +183,6 @@ struct volume_id *volume_id_open_node(const char *path)
 	return id;
 }
 
-/* open volume by major/minor */
-struct volume_id *volume_id_open_dev_t(dev_t devt)
-{
-	struct volume_id *id;
-	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-1] = '\0';
-
-	/* create tempory node to open the block device */
-	unlink(tmp_node);
-	if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0)
-		return NULL;
-
-	id = volume_id_open_node(tmp_node);
-
-	unlink(tmp_node);
-
-	return id;
-}
-
 void volume_id_close(struct volume_id *id)
 {
 	if (id == NULL)