From: Karel Zak Date: Thu, 3 Aug 2017 13:09:06 +0000 (+0200) Subject: libblkid: mark UBI as RAID X-Git-Tag: v2.31-rc1~143^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1266fcf9cf7597c7dfd21a185bce60133d5883c7;p=thirdparty%2Futil-linux.git 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 --- diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c index cb887f8f17..e631e90ac8 100644 --- 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 ee26447921..0739c32c6e 100644 --- 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 318a35152a..3c5e8a5cc4 100644 --- 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 ed3b3f4260..1a073f21ea 100644 Binary files a/tests/ts/blkid/images-fs/ubi.img.xz and b/tests/ts/blkid/images-fs/ubi.img.xz differ