summaryrefslogtreecommitdiffstats
path: root/libblkid/src/superblocks
diff options
context:
space:
mode:
authorKarel Zak2017-08-03 15:09:06 +0200
committerKarel Zak2017-08-03 15:31:54 +0200
commit1266fcf9cf7597c7dfd21a185bce60133d5883c7 (patch)
tree8efe9709ee6a59dcc4b64747ce0d303e78835e89 /libblkid/src/superblocks
parentlibblkid: add support for UBI superblock (diff)
downloadkernel-qcow2-util-linux-1266fcf9cf7597c7dfd21a185bce60133d5883c7.tar.gz
kernel-qcow2-util-linux-1266fcf9cf7597c7dfd21a185bce60133d5883c7.tar.xz
kernel-qcow2-util-linux-1266fcf9cf7597c7dfd21a185bce60133d5883c7.zip
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>
Diffstat (limited to 'libblkid/src/superblocks')
-rw-r--r--libblkid/src/superblocks/superblocks.c2
-rw-r--r--libblkid/src/superblocks/ubi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index cb887f8f1..e631e90ac 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 ee2644792..0739c32c6 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 =
{