libblkid: mark UBI as RAID

UBI is volume manager rather than filesystem. Note that libblkid has
optimized RAIDs probing (don't search for another filesystems is RAID
detected). We also don't search for RAIDs on very small devices, but
this optimization is ignored for UBI char devices (size=1byte).

Signed-off-by: Karel Zak <kzak@redhat.com>

libblkid/src/superblocks/superblocks.c

@@ -112,6 +112,7 @@ static const struct blkid_idinfo *idinfos[] =
 	&integrity_idinfo,
 	&luks_idinfo,
 	&vmfs_volume_idinfo,
+	&ubi_idinfo,
 
 	/* Filesystems */
 	&vfat_idinfo,
@@ -152,7 +153,6 @@ static const struct blkid_idinfo *idinfos[] =
 	&squashfs3_idinfo,
 	&netware_idinfo,
 	&btrfs_idinfo,
-	&ubi_idinfo,
 	&ubifs_idinfo,
 	&bfs_idinfo,
 	&vmfs_fs_idinfo,

libblkid/src/superblocks/ubi.c

@@ -41,7 +41,7 @@ static int probe_ubi(blkid_probe pr, const struct blkid_idmag *mag)
 const struct blkid_idinfo ubi_idinfo =
 {
 	.name		= "ubi",
-	.usage		= BLKID_USAGE_FILESYSTEM,
+	.usage		= BLKID_USAGE_RAID,
 	.probefunc	= probe_ubi,
 	.magics		=
 	{

tests/expected/blkid/low-probe-ubi

@@ -1,5 +1,5 @@
 ID_FS_TYPE=ubi
-ID_FS_USAGE=filesystem
+ID_FS_USAGE=raid
 ID_FS_UUID=1329411831
 ID_FS_UUID_ENC=1329411831
 ID_FS_VERSION=1