41 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 7e13a61eb..091d76b8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -921,7 +921,7 @@ schedutils/Makefile
 shlibs/blkid/blkid.pc
 shlibs/blkid/Makefile
 shlibs/blkid/src/Makefile
-shlibs/blkid/src/probers/Makefile
+shlibs/blkid/src/superblocks/Makefile
 shlibs/uuid/uuid.pc
 shlibs/uuid/Makefile
 shlibs/uuid/man/Makefile
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index bd040ce92..10d1baa8c 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-SUBDIRS = probers .
+SUBDIRS = superblocks .
 
 common_ldadd =
 common_cflags =
@@ -24,7 +24,7 @@ blkidinc_HEADERS = blkid.h
 usrlib_exec_LTLIBRARIES = libblkid.la
 libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
 		     probe.c read.c resolve.c save.c tag.c version.c verify.c \
-		     encode.c blkid.h list.h blkidP.h probers/probers.h \
+		     encode.c blkid.h list.h blkidP.h superblocks/superblocks.h \
 		     config.c evaluate.c \
 		     $(blkidinc_HEADERS) \
 		     $(top_srcdir)/lib/blkdev.c \
@@ -32,7 +32,7 @@ libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
 		     $(top_srcdir)/lib/canonicalize.c \
 		     $(top_srcdir)/lib/md5.c
 
-libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
+libblkid_la_LIBADD = superblocks/libblkid_superblocks.la $(common_ldadd)
 libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
 
 libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 10fcb0035..4677389ec 100644
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -36,7 +36,8 @@
 
 #include "blkdev.h"
 #include "blkidP.h"
-#include "probers/probers.h"
+
+#include "superblocks/superblocks.h"
 
 static const struct blkid_idinfo *idinfos[] =
 {
diff --git a/shlibs/blkid/src/probers/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am
index 4591db6ae..07508702f 100644
--- a/shlibs/blkid/src/probers/Makefile.am
+++ b/shlibs/blkid/src/superblocks/Makefile.am
@@ -2,9 +2,9 @@ include $(top_srcdir)/config/include-Makefile.am
 
 AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
 
-noinst_LTLIBRARIES = libblkid_probers.la
-libblkid_probers_la_SOURCES = \
-			probers.h \
+noinst_LTLIBRARIES = libblkid_superblocks.la
+libblkid_superblocks_la_SOURCES = \
+			superblocks.h \
 			cramfs.c \
 			swap.c \
 			adaptec_raid.c \
diff --git a/shlibs/blkid/src/probers/adaptec_raid.c b/shlibs/blkid/src/superblocks/adaptec_raid.c
index 5e8b3a758..5e8b3a758 100644
--- a/shlibs/blkid/src/probers/adaptec_raid.c
+++ b/shlibs/blkid/src/superblocks/adaptec_raid.c
diff --git a/shlibs/blkid/src/probers/btrfs.c b/shlibs/blkid/src/superblocks/btrfs.c
index 3205e3d97..3205e3d97 100644
--- a/shlibs/blkid/src/probers/btrfs.c
+++ b/shlibs/blkid/src/superblocks/btrfs.c
diff --git a/shlibs/blkid/src/probers/cramfs.c b/shlibs/blkid/src/superblocks/cramfs.c
index 0ea124b30..0ea124b30 100644
--- a/shlibs/blkid/src/probers/cramfs.c
+++ b/shlibs/blkid/src/superblocks/cramfs.c
diff --git a/shlibs/blkid/src/probers/ddf_raid.c b/shlibs/blkid/src/superblocks/ddf_raid.c
index 41d6e1235..41d6e1235 100644
--- a/shlibs/blkid/src/probers/ddf_raid.c
+++ b/shlibs/blkid/src/superblocks/ddf_raid.c
diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/superblocks/ext.c
index c27411d24..c27411d24 100644
--- a/shlibs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/superblocks/ext.c
diff --git a/shlibs/blkid/src/probers/gfs.c b/shlibs/blkid/src/superblocks/gfs.c
index 584561cf3..584561cf3 100644
--- a/shlibs/blkid/src/probers/gfs.c
+++ b/shlibs/blkid/src/superblocks/gfs.c
diff --git a/shlibs/blkid/src/probers/hfs.c b/shlibs/blkid/src/superblocks/hfs.c
index 4cdef0ee7..4cdef0ee7 100644
--- a/shlibs/blkid/src/probers/hfs.c
+++ b/shlibs/blkid/src/superblocks/hfs.c
diff --git a/shlibs/blkid/src/probers/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c
index c7c92db44..c7c92db44 100644
--- a/shlibs/blkid/src/probers/highpoint_raid.c
+++ b/shlibs/blkid/src/superblocks/highpoint_raid.c
diff --git a/shlibs/blkid/src/probers/hpfs.c b/shlibs/blkid/src/superblocks/hpfs.c
index 2f5f0d198..2f5f0d198 100644
--- a/shlibs/blkid/src/probers/hpfs.c
+++ b/shlibs/blkid/src/superblocks/hpfs.c
diff --git a/shlibs/blkid/src/probers/iso9660.c b/shlibs/blkid/src/superblocks/iso9660.c
index ca53e3ae4..ca53e3ae4 100644
--- a/shlibs/blkid/src/probers/iso9660.c
+++ b/shlibs/blkid/src/superblocks/iso9660.c
diff --git a/shlibs/blkid/src/probers/isw_raid.c b/shlibs/blkid/src/superblocks/isw_raid.c
index f9ae7453f..f9ae7453f 100644
--- a/shlibs/blkid/src/probers/isw_raid.c
+++ b/shlibs/blkid/src/superblocks/isw_raid.c
diff --git a/shlibs/blkid/src/probers/jfs.c b/shlibs/blkid/src/superblocks/jfs.c
index 5d9b39acd..5d9b39acd 100644
--- a/shlibs/blkid/src/probers/jfs.c
+++ b/shlibs/blkid/src/superblocks/jfs.c
diff --git a/shlibs/blkid/src/probers/jmicron_raid.c b/shlibs/blkid/src/superblocks/jmicron_raid.c
index ae852f8ff..ae852f8ff 100644
--- a/shlibs/blkid/src/probers/jmicron_raid.c
+++ b/shlibs/blkid/src/superblocks/jmicron_raid.c
diff --git a/shlibs/blkid/src/probers/linux_raid.c b/shlibs/blkid/src/superblocks/linux_raid.c
index a5926561d..a5926561d 100644
--- a/shlibs/blkid/src/probers/linux_raid.c
+++ b/shlibs/blkid/src/superblocks/linux_raid.c
diff --git a/shlibs/blkid/src/probers/lsi_raid.c b/shlibs/blkid/src/superblocks/lsi_raid.c
index d9ac4e12e..d9ac4e12e 100644
--- a/shlibs/blkid/src/probers/lsi_raid.c
+++ b/shlibs/blkid/src/superblocks/lsi_raid.c
diff --git a/shlibs/blkid/src/probers/luks.c b/shlibs/blkid/src/superblocks/luks.c
index 2fe4ff3b4..2fe4ff3b4 100644
--- a/shlibs/blkid/src/probers/luks.c
+++ b/shlibs/blkid/src/superblocks/luks.c
diff --git a/shlibs/blkid/src/probers/lvm.c b/shlibs/blkid/src/superblocks/lvm.c
index d8edc37ab..d8edc37ab 100644
--- a/shlibs/blkid/src/probers/lvm.c
+++ b/shlibs/blkid/src/superblocks/lvm.c
diff --git a/shlibs/blkid/src/probers/minix.c b/shlibs/blkid/src/superblocks/minix.c
index b29b9a427..b29b9a427 100644
--- a/shlibs/blkid/src/probers/minix.c
+++ b/shlibs/blkid/src/superblocks/minix.c
diff --git a/shlibs/blkid/src/probers/netware.c b/shlibs/blkid/src/superblocks/netware.c
index 722506f87..722506f87 100644
--- a/shlibs/blkid/src/probers/netware.c
+++ b/shlibs/blkid/src/superblocks/netware.c
diff --git a/shlibs/blkid/src/probers/ntfs.c b/shlibs/blkid/src/superblocks/ntfs.c
index 55a186a38..55a186a38 100644
--- a/shlibs/blkid/src/probers/ntfs.c
+++ b/shlibs/blkid/src/superblocks/ntfs.c
diff --git a/shlibs/blkid/src/probers/nvidia_raid.c b/shlibs/blkid/src/superblocks/nvidia_raid.c
index 76361763c..76361763c 100644
--- a/shlibs/blkid/src/probers/nvidia_raid.c
+++ b/shlibs/blkid/src/superblocks/nvidia_raid.c
diff --git a/shlibs/blkid/src/probers/ocfs.c b/shlibs/blkid/src/superblocks/ocfs.c
index f9bd11aae..f9bd11aae 100644
--- a/shlibs/blkid/src/probers/ocfs.c
+++ b/shlibs/blkid/src/superblocks/ocfs.c
diff --git a/shlibs/blkid/src/probers/promise_raid.c b/shlibs/blkid/src/superblocks/promise_raid.c
index 295400925..295400925 100644
--- a/shlibs/blkid/src/probers/promise_raid.c
+++ b/shlibs/blkid/src/superblocks/promise_raid.c
diff --git a/shlibs/blkid/src/probers/reiserfs.c b/shlibs/blkid/src/superblocks/reiserfs.c
index f9a46787e..f9a46787e 100644
--- a/shlibs/blkid/src/probers/reiserfs.c
+++ b/shlibs/blkid/src/superblocks/reiserfs.c
diff --git a/shlibs/blkid/src/probers/romfs.c b/shlibs/blkid/src/superblocks/romfs.c
index b5c20ab7f..b5c20ab7f 100644
--- a/shlibs/blkid/src/probers/romfs.c
+++ b/shlibs/blkid/src/superblocks/romfs.c
diff --git a/shlibs/blkid/src/probers/silicon_raid.c b/shlibs/blkid/src/superblocks/silicon_raid.c
index a65d79a83..a65d79a83 100644
--- a/shlibs/blkid/src/probers/silicon_raid.c
+++ b/shlibs/blkid/src/superblocks/silicon_raid.c
diff --git a/shlibs/blkid/src/probers/squashfs.c b/shlibs/blkid/src/superblocks/squashfs.c
index 74f53bfb6..74f53bfb6 100644
--- a/shlibs/blkid/src/probers/squashfs.c
+++ b/shlibs/blkid/src/superblocks/squashfs.c
diff --git a/shlibs/blkid/src/probers/probers.h b/shlibs/blkid/src/superblocks/superblocks.h
index 78dbd4065..78dbd4065 100644
--- a/shlibs/blkid/src/probers/probers.h
+++ b/shlibs/blkid/src/superblocks/superblocks.h
diff --git a/shlibs/blkid/src/probers/swap.c b/shlibs/blkid/src/superblocks/swap.c
index c289488a1..c289488a1 100644
--- a/shlibs/blkid/src/probers/swap.c
+++ b/shlibs/blkid/src/superblocks/swap.c
diff --git a/shlibs/blkid/src/probers/sysv.c b/shlibs/blkid/src/superblocks/sysv.c
index 933163a27..933163a27 100644
--- a/shlibs/blkid/src/probers/sysv.c
+++ b/shlibs/blkid/src/superblocks/sysv.c
diff --git a/shlibs/blkid/src/probers/udf.c b/shlibs/blkid/src/superblocks/udf.c
index 5f4046d6d..5f4046d6d 100644
--- a/shlibs/blkid/src/probers/udf.c
+++ b/shlibs/blkid/src/superblocks/udf.c
diff --git a/shlibs/blkid/src/probers/ufs.c b/shlibs/blkid/src/superblocks/ufs.c
index fe9870d84..fe9870d84 100644
--- a/shlibs/blkid/src/probers/ufs.c
+++ b/shlibs/blkid/src/superblocks/ufs.c
diff --git a/shlibs/blkid/src/probers/vfat.c b/shlibs/blkid/src/superblocks/vfat.c
index a83175c0b..a83175c0b 100644
--- a/shlibs/blkid/src/probers/vfat.c
+++ b/shlibs/blkid/src/superblocks/vfat.c
diff --git a/shlibs/blkid/src/probers/via_raid.c b/shlibs/blkid/src/superblocks/via_raid.c
index 22022fdd5..22022fdd5 100644
--- a/shlibs/blkid/src/probers/via_raid.c
+++ b/shlibs/blkid/src/superblocks/via_raid.c
diff --git a/shlibs/blkid/src/probers/vxfs.c b/shlibs/blkid/src/superblocks/vxfs.c
index 7a27b6c9e..7a27b6c9e 100644
--- a/shlibs/blkid/src/probers/vxfs.c
+++ b/shlibs/blkid/src/superblocks/vxfs.c
diff --git a/shlibs/blkid/src/probers/xfs.c b/shlibs/blkid/src/superblocks/xfs.c
index fa7914e29..fa7914e29 100644
--- a/shlibs/blkid/src/probers/xfs.c
+++ b/shlibs/blkid/src/superblocks/xfs.c
diff --git a/shlibs/blkid/src/probers/zfs.c b/shlibs/blkid/src/superblocks/zfs.c
index 7d39034f6..7d39034f6 100644
--- a/shlibs/blkid/src/probers/zfs.c
+++ b/shlibs/blkid/src/superblocks/zfs.c