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>

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index cb887f8f1726ef8d46c3dc3677d409286e8bb69a..e631e90ac822b85757fe02774046586383e814aa 100644 (file)
--- a/libblkid/src/superblocks/superblocks.c
+++ b/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,

diff --git a/libblkid/src/superblocks/ubi.c b/libblkid/src/superblocks/ubi.c
index ee26447921a800bc502656868e47cf5384a62c9c..0739c32c6e970aa8c4207a44b1e32af4b8831bde 100644 (file)
--- a/libblkid/src/superblocks/ubi.c
+++ b/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         =
        {

diff --git a/tests/expected/blkid/low-probe-ubi b/tests/expected/blkid/low-probe-ubi
index 318a35152ae04fdf1d7e92e161d6537cc9883201..3c5e8a5cc4c2099c1580f0b0a89d498dea7e96b9 100644 (file)
--- a/tests/expected/blkid/low-probe-ubi
+++ b/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

diff --git a/tests/ts/blkid/images-fs/ubi.img.xz b/tests/ts/blkid/images-fs/ubi.img.xz
index ed3b3f4260f543608887d7cf09c9ff8fec8a7f1b..1a073f21eacf008cb981c59cf1bf2e9ca403bc3e 100644 (file)
Binary files a/tests/ts/blkid/images-fs/ubi.img.xz and b/tests/ts/blkid/images-fs/ubi.img.xz differ