libblkid: add FSBLOCKSIZE tag

The FSBLOCKSIZE tag exposes file system block size in contrast to
the BLOCK_SIZE (unfortunate name) which returns minimal accessible
block size (sector size).

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>

diff --git a/libblkid/src/superblocks/apfs.c b/libblkid/src/superblocks/apfs.c
index 3332ef22870df13b80118623e01ea84c5d37edbe..048423a8b3e5fbf1556b4295108491a6edf5308e 100644 (file)
--- a/libblkid/src/superblocks/apfs.c
+++ b/libblkid/src/superblocks/apfs.c
@@ -65,6 +65,7 @@ static int probe_apfs(blkid_probe pr, const struct blkid_idmag *mag)
        if (blkid_probe_set_uuid(pr, sb->uuid) < 0)
                return BLKID_PROBE_NONE;
 
+       blkid_probe_set_fsblocksize(pr, le32_to_cpu(sb->block_size));
        blkid_probe_set_block_size(pr, le32_to_cpu(sb->block_size));
 
        return BLKID_PROBE_OK;

diff --git a/libblkid/src/superblocks/befs.c b/libblkid/src/superblocks/befs.c
index 211feae9fed2105bf68e3882c9cb37cc162a5f6a..1ba0e10ae26f45906d42f76593ea175c2e0827c8 100644 (file)
--- a/libblkid/src/superblocks/befs.c
+++ b/libblkid/src/superblocks/befs.c
@@ -521,6 +521,7 @@ static int probe_befs(blkid_probe pr, const struct blkid_idmag *mag)
                                        sizeof(volume_id), "%016" PRIx64,
                                        FS64_TO_CPU(volume_id, fs_le));
 
+       blkid_probe_set_fsblocksize(pr, block_size);
        blkid_probe_set_block_size(pr, block_size);
 
        return BLKID_PROBE_OK;

diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index 0ead1f5916c3428e6f10839095e572f8b6d3aab4..34fe0f07cce0deed1174d70a84f4c146c84b6a1c 100644 (file)
--- a/libblkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
@@ -234,6 +234,7 @@ static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_set_uuid(pr, bfs->fsid);
        blkid_probe_set_uuid_as(pr, bfs->dev_item.uuid, "UUID_SUB");
+       blkid_probe_set_fsblocksize(pr, le32_to_cpu(bfs->sectorsize));
        blkid_probe_set_block_size(pr, le32_to_cpu(bfs->sectorsize));
 
        uint32_t sectorsize_log = 31 -

diff --git a/libblkid/src/superblocks/erofs.c b/libblkid/src/superblocks/erofs.c
index 0e7b4223dda58692730eaf76760a35af3b7173ef..30914a89c4f8a183a487cae5a03fbe028c80e234 100644 (file)
--- a/libblkid/src/superblocks/erofs.c
+++ b/libblkid/src/superblocks/erofs.c
@@ -51,8 +51,11 @@ static int probe_erofs(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_set_uuid(pr, sb->uuid);
 
-       if (sb->blkszbits < 32)
+       if (sb->blkszbits < 32){
+               blkid_probe_set_fsblocksize(pr, 1U << sb->blkszbits);
                blkid_probe_set_block_size(pr, 1U << sb->blkszbits);
+       }
+
        return BLKID_PROBE_OK;
 }
 

diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index f586ec78651a6191847999c3a75a4660de23306b..fd2b8565529180982e700dfb956aab8afea346b9 100644 (file)
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -139,6 +139,7 @@ static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag)
        blkid_probe_sprintf_version(pr, "%u.%u",
                        sb->version.vermaj, sb->version.vermin);
 
+       blkid_probe_set_fsblocksize(pr, BLOCK_SIZE(sb));
        blkid_probe_set_block_size(pr, BLOCK_SIZE(sb));
 
        return BLKID_PROBE_OK;

diff --git a/libblkid/src/superblocks/exfs.c b/libblkid/src/superblocks/exfs.c
index e0eafafc686be506652f6cca349ff5bffb01a92d..87dc0a0c738c59fe38208c1aecafd423dde1eee2 100644 (file)
--- a/libblkid/src/superblocks/exfs.c
+++ b/libblkid/src/superblocks/exfs.c
@@ -173,6 +173,7 @@ static int probe_exfs(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_set_uuid(pr, xs->sb_uuid);
 
+       blkid_probe_set_fsblocksize(pr, be32_to_cpu(xs->sb_blocksize));
        blkid_probe_set_block_size(pr, be32_to_cpu(xs->sb_blocksize));
 
        return 0;

diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c
index 0b9023734750caf3850ee27a937314c7bcf35216..cbbe8eb969d3f31f0e6ce12f92986c2019675324 100644 (file)
--- a/libblkid/src/superblocks/ext.c
+++ b/libblkid/src/superblocks/ext.c
@@ -189,8 +189,10 @@ static void ext_get_info(blkid_probe pr, int ver, struct ext2_super_block *es)
                le32_to_cpu(es->s_rev_level),
                le16_to_cpu(es->s_minor_rev_level));
 
-       if (le32_to_cpu(es->s_log_block_size) < 32)
+       if (le32_to_cpu(es->s_log_block_size) < 32){
+               blkid_probe_set_fsblocksize(pr, 1024U << le32_to_cpu(es->s_log_block_size));
                blkid_probe_set_block_size(pr, 1024U << le32_to_cpu(es->s_log_block_size));
+       }
 
        uint64_t fslastblock = le32_to_cpu(es->s_blocks_count) |
                ((s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ?

diff --git a/libblkid/src/superblocks/f2fs.c b/libblkid/src/superblocks/f2fs.c
index aed93e25b3e7fbe6927d4a537f1f663afacc4d88..f271e80470945312eb1afe6b5c423cc86fae9a6f 100644 (file)
--- a/libblkid/src/superblocks/f2fs.c
+++ b/libblkid/src/superblocks/f2fs.c
@@ -78,8 +78,10 @@ static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_set_uuid(pr, sb->uuid);
        blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
-       if (le32_to_cpu(sb->log_blocksize) < 32)
+       if (le32_to_cpu(sb->log_blocksize) < 32){
+               blkid_probe_set_fsblocksize(pr, 1U << le32_to_cpu(sb->log_blocksize));
                blkid_probe_set_block_size(pr, 1U << le32_to_cpu(sb->log_blocksize));
+       }
        return 0;
 }
 

diff --git a/libblkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c
index 37a74b157f909312b666ee598edcbddc7deea072..445c0dafa3285baa926b02dc8f2acf8b095d797d 100644 (file)
--- a/libblkid/src/superblocks/gfs.c
+++ b/libblkid/src/superblocks/gfs.c
@@ -106,6 +106,7 @@ static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag)
                                sizeof(sbd->sb_locktable));
                blkid_probe_set_uuid(pr, sbd->sb_uuid);
                blkid_probe_set_version(pr, "1");
+               blkid_probe_set_fsblocksize(pr, be32_to_cpu(sbd->sb_bsize));
                blkid_probe_set_block_size(pr, be32_to_cpu(sbd->sb_bsize));
                return 0;
        }

diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
index ebf90e49e6ebfd92e5359b19257f63c1d2142761..9674b1481f572e4274653c3c923db68b06121272 100644 (file)
--- a/libblkid/src/superblocks/hfs.c
+++ b/libblkid/src/superblocks/hfs.c
@@ -241,6 +241,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag)
        if (blocksize < HFSPLUS_SECTOR_SIZE)
                return 1;
 
+       blkid_probe_set_fsblocksize(pr, blocksize);
        blkid_probe_set_block_size(pr, blocksize);
 
        memcpy(extents, hfsplus->cat_file.extents, sizeof(extents));

diff --git a/libblkid/src/superblocks/hpfs.c b/libblkid/src/superblocks/hpfs.c
index dcf4520b638f69190eecf1d2eea87d5624dd3cb2..09bf975eabb4400f9c0d81dd6934b1a510eff78c 100644 (file)
--- a/libblkid/src/superblocks/hpfs.c
+++ b/libblkid/src/superblocks/hpfs.c
@@ -99,6 +99,7 @@ static int probe_hpfs(blkid_probe pr, const struct blkid_idmag *mag)
                                hbb->vol_serno[1], hbb->vol_serno[0]);
        }
        blkid_probe_sprintf_version(pr, "%u", version);
+       blkid_probe_set_fsblocksize(pr, 512);
        blkid_probe_set_block_size(pr, 512);
 
        return 0;

diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index 289a325c8ceed0a96eb09a3616cc87ccf08a261b..503126c0060bad411c37f0af6031ded8872e4217 100644 (file)
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -90,6 +90,7 @@ static int probe_iso9660_hsfs(blkid_probe pr, const struct blkid_idmag *mag)
        if (!iso)
                return errno ? -errno : 1;
 
+       blkid_probe_set_fsblocksize(pr, ISO_SECTOR_SIZE);
        blkid_probe_set_block_size(pr, ISO_SECTOR_SIZE);
        blkid_probe_set_version(pr, "High Sierra");
        blkid_probe_set_label(pr, iso->volume_id, sizeof(iso->volume_id));
@@ -249,6 +250,7 @@ static int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
        if (!pvd)
                return errno ? -errno : 1;
 
+       blkid_probe_set_fsblocksize(pr, ISO_SECTOR_SIZE);
        blkid_probe_set_block_size(pr, ISO_SECTOR_SIZE);
 
        if (joliet && (len = merge_utf16be_ascii(buf, joliet->system_id, pvd->system_id, sizeof(pvd->system_id))) != 0)

diff --git a/libblkid/src/superblocks/jfs.c b/libblkid/src/superblocks/jfs.c
index 3de8c2e3dfb2c4c3a3a0663817ec8329ecd037ea..e22467246cdc6a47e7134b84c222031663cfe86b 100644 (file)
--- a/libblkid/src/superblocks/jfs.c
+++ b/libblkid/src/superblocks/jfs.c
@@ -52,6 +52,7 @@ static int probe_jfs(blkid_probe pr, const struct blkid_idmag *mag)
        if (*((char *) js->js_label) != '\0')
                blkid_probe_set_label(pr, js->js_label, sizeof(js->js_label));
        blkid_probe_set_uuid(pr, js->js_uuid);
+       blkid_probe_set_fsblocksize(pr, le32_to_cpu(js->js_bsize));
        blkid_probe_set_block_size(pr, le32_to_cpu(js->js_bsize));
        return 0;
 }

diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
index b521efb2bc89348c8125b385209f3eb8c2adcd7d..6011842f7f4b1706b716b3ddad6131fa03f97bb4 100644 (file)
--- a/libblkid/src/superblocks/minix.c
+++ b/libblkid/src/superblocks/minix.c
@@ -148,6 +148,7 @@ static int probe_minix(blkid_probe pr,
                return 1;
 
        blkid_probe_sprintf_version(pr, "%d", version);
+       blkid_probe_set_fsblocksize(pr, block_size);
        blkid_probe_set_block_size(pr, block_size);
        return 0;
 }

diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c
index 423bd1ac4e0c43b4cc77a34a43a4e13c0f3c17f5..ca7574a522d2ee8d3f9ef29b4f25837dc63e35c7 100644 (file)
--- a/libblkid/src/superblocks/nilfs.c
+++ b/libblkid/src/superblocks/nilfs.c
@@ -157,8 +157,10 @@ static int probe_nilfs2(blkid_probe pr,
                                (unsigned char *) &sb->s_magic))
                return 1;
 
-       if (le32_to_cpu(sb->s_log_block_size) < 32)
+       if (le32_to_cpu(sb->s_log_block_size) < 32){
+               blkid_probe_set_fsblocksize(pr, 1024U << le32_to_cpu(sb->s_log_block_size));
                blkid_probe_set_block_size(pr, 1024U << le32_to_cpu(sb->s_log_block_size));
+       }
 
        return 0;
 }

diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index be2e3d895f9873b95228d8caee8d5842e4ede2bd..9f1927cf74efb7e0c1b4b1cb09db070080610a6e 100644 (file)
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -208,6 +208,8 @@ static int __probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag, int save_
                attr_off += attr_len;
        }
 
+
+       blkid_probe_set_fsblocksize(pr, sector_size * sectors_per_cluster);
        blkid_probe_set_block_size(pr, sector_size);
 
        blkid_probe_sprintf_uuid(pr,

diff --git a/libblkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c
index 463ed7bcffce801f94225ee607308cc2d78e14eb..28df6ddfa431770a1510af6fbd53cc4e6fc5d8bb 100644 (file)
--- a/libblkid/src/superblocks/ocfs.c
+++ b/libblkid/src/superblocks/ocfs.c
@@ -153,8 +153,10 @@ static int probe_ocfs2(blkid_probe pr, const struct blkid_idmag *mag)
                le16_to_cpu(osb->s_major_rev_level),
                le16_to_cpu(osb->s_minor_rev_level));
 
-       if (le32_to_cpu(osb->s_blocksize_bits) < 32)
+       if (le32_to_cpu(osb->s_blocksize_bits) < 32){
+               blkid_probe_set_fsblocksize(pr, 1U << le32_to_cpu(osb->s_blocksize_bits));
                blkid_probe_set_block_size(pr, 1U << le32_to_cpu(osb->s_blocksize_bits));
+       }
 
        return 0;
 }

diff --git a/libblkid/src/superblocks/reiserfs.c b/libblkid/src/superblocks/reiserfs.c
index 6c5e5b0d7103b96d2b6f5e858ca14f994810916d..23d10e2e275288759190ab7e9480903cb0ba5ce5 100644 (file)
--- a/libblkid/src/superblocks/reiserfs.c
+++ b/libblkid/src/superblocks/reiserfs.c
@@ -74,6 +74,7 @@ static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag)
        else
                blkid_probe_set_version(pr, "3.5");
 
+       blkid_probe_set_fsblocksize(pr, blocksize);
        blkid_probe_set_block_size(pr, blocksize);
 
        return 0;
@@ -95,6 +96,7 @@ static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag)
        blkid_probe_set_uuid(pr, rs4->rs4_uuid);
        blkid_probe_set_version(pr, "4");
 
+       blkid_probe_set_fsblocksize(pr, blocksize);
        blkid_probe_set_block_size(pr, blocksize);
 
        return 0;

diff --git a/libblkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c
index 1c2ac4315edf8566026b2ca00e7d2fb5edfa1a02..8db88775be829b267fbf751d29716da4eec27db6 100644 (file)
--- a/libblkid/src/superblocks/romfs.c
+++ b/libblkid/src/superblocks/romfs.c
@@ -35,6 +35,7 @@ static int probe_romfs(blkid_probe pr, const struct blkid_idmag *mag)
                blkid_probe_set_label(pr, ros->ros_volume,
                                sizeof(ros->ros_volume));
 
+       blkid_probe_set_fsblocksize(pr, 1024);
        blkid_probe_set_block_size(pr, 1024);
 
        return 0;

diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
index 4db84249369cf3c10a6eced8d64da9395cf77f8d..d85ff8f1ab0b9b548845c334963f571bc7528185 100644 (file)
--- a/libblkid/src/superblocks/squashfs.c
+++ b/libblkid/src/superblocks/squashfs.c
@@ -71,6 +71,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
 
        blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
 
+       blkid_probe_set_fsblocksize(pr, 1024);
        blkid_probe_set_block_size(pr, 1024);
 
        return 0;

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index a1f42c6115dbf9464388f8c18e001fd1b3cbc2e5..9cfa991fc755057cd1c3716d0f3c04c67e2645c5 100644 (file)
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -70,6 +70,8 @@
  *
  * @FSLASTBLOCK: last fsblock/total number of fsblocks
  *
+ * @FSBLOCKSIZE: file system block size
+ *
  * @SYSTEM_ID: ISO9660 system identifier
  *
  * @PUBLISHER_ID: ISO9660 publisher identifier
@@ -613,6 +615,17 @@ int blkid_probe_set_fslastblock(blkid_probe pr, uint64_t lastblock)
                        lastblock);
 }
 
+int blkid_probe_set_fsblocksize(blkid_probe pr, uint32_t block_size)
+{
+       struct blkid_chain *chn = blkid_probe_get_chain(pr);
+
+       if (!(chn->flags & BLKID_SUBLKS_FSINFO))
+               return 0;
+
+       return blkid_probe_sprintf_value(pr, "FSBLOCKSIZE", "%" PRIu32,
+                       block_size);
+}
+
 int blkid_probe_set_id_label(blkid_probe pr, const char *name,
                             const unsigned char *data, size_t len)
 {

diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 251e2e3861821a7d3aaf64453972770550a8b03a..8a1b85ddac6acac8e181c3d65955219aafc6fcc6 100644 (file)
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -113,6 +113,7 @@ extern int blkid_probe_set_utf8_id_label(blkid_probe pr, const char *name,
 int blkid_probe_set_block_size(blkid_probe pr, unsigned block_size);
 int blkid_probe_set_fssize(blkid_probe pr, uint64_t size);
 int blkid_probe_set_fslastblock(blkid_probe pr, uint64_t lastblock);
+int blkid_probe_set_fsblocksize(blkid_probe pr, uint32_t block_size);
 
 extern int blkid_probe_is_bitlocker(blkid_probe pr);
 extern int blkid_probe_is_ntfs(blkid_probe pr);

diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
index 9ed089ee4188c2fa6a8c414a46e0393eb95bd172..36adf60f147bab737ae86ff026f40716a5b2fab3 100644 (file)
--- a/libblkid/src/superblocks/udf.c
+++ b/libblkid/src/superblocks/udf.c
@@ -569,6 +569,7 @@ real_blksz:
                 * E.g. number 0x0150 is revision 1.50, number 0x0201 is revision 2.01. */
                blkid_probe_sprintf_version(pr, "%x.%02x", (unsigned int)(udf_rev >> 8), (unsigned int)(udf_rev & 0xFF));
 
+       blkid_probe_set_fsblocksize(pr, bs);
        blkid_probe_set_block_size(pr, bs);
 
        return 0;

diff --git a/libblkid/src/superblocks/ufs.c b/libblkid/src/superblocks/ufs.c
index 7a8396c1c4abb07a95245ffe8031285c5391ac68..5da87b18f6d16308cce4e0cedd34022311da51e6 100644 (file)
--- a/libblkid/src/superblocks/ufs.c
+++ b/libblkid/src/superblocks/ufs.c
@@ -233,10 +233,14 @@ found:
                        (unsigned char *) &ufs->fs_magic))
                return 1;
 
+       uint32_t bsize = 0;
        if (!is_be)
-               blkid_probe_set_block_size(pr, le32_to_cpu(ufs->fs_fsize));
+               bsize = le32_to_cpu(ufs->fs_fsize);
        else
-               blkid_probe_set_block_size(pr, be32_to_cpu(ufs->fs_fsize));
+               bsize = be32_to_cpu(ufs->fs_fsize);
+
+       blkid_probe_set_fsblocksize(pr, bsize);
+       blkid_probe_set_block_size(pr, bsize);
 
        return 0;
 }

diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
index 71813485a031c1a799b2d1e1f085f76b9684c7b1..6cd58cc71f95467407052acaadef3a5362e256b2 100644 (file)
--- a/libblkid/src/superblocks/vfat.c
+++ b/libblkid/src/superblocks/vfat.c
@@ -433,6 +433,7 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
        if (version)
                blkid_probe_set_version(pr, version);
 
+       blkid_probe_set_fsblocksize(pr, vs->vs_cluster_size * sector_size);
        blkid_probe_set_block_size(pr, sector_size);
 
        return 0;

diff --git a/libblkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c
index d9d26adcfde8dab707df7056aa6e153506fadf18..0f3c07b0c867fbd8b966e64b900733f9906632d7 100644 (file)
--- a/libblkid/src/superblocks/vxfs.c
+++ b/libblkid/src/superblocks/vxfs.c
@@ -33,9 +33,11 @@ static int probe_vxfs(blkid_probe pr, const struct blkid_idmag *mag)
 
        if (le32_to_cpu(vxs->vs_magic) == 0xa501fcf5) {
                blkid_probe_sprintf_version(pr, "%u", (unsigned int)le32_to_cpu(vxs->vs_version));
+               blkid_probe_set_fsblocksize(pr, le32_to_cpu(vxs->vs_bsize));
                blkid_probe_set_block_size(pr, le32_to_cpu(vxs->vs_bsize));
        } else if (be32_to_cpu(vxs->vs_magic) == 0xa501fcf5) {
                blkid_probe_sprintf_version(pr, "%u", (unsigned int)be32_to_cpu(vxs->vs_version));
+               blkid_probe_set_fsblocksize(pr, be32_to_cpu(vxs->vs_bsize));
                blkid_probe_set_block_size(pr, be32_to_cpu(vxs->vs_bsize));
        }
        return 0;

diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index 1f2e92cac52b6f5ced884b9977c97a5294290137..2cc6f6179fda6f8eb82c58fc20976bb5ae972b88 100644 (file)
--- a/libblkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
@@ -184,6 +184,7 @@ static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
        blkid_probe_set_uuid(pr, xs->sb_uuid);
        blkid_probe_set_fssize(pr, xfs_fssize(xs));
        blkid_probe_set_fslastblock(pr, be64_to_cpu(xs->sb_dblocks));
+       blkid_probe_set_fsblocksize(pr, be32_to_cpu(xs->sb_blocksize));
        blkid_probe_set_block_size(pr, be16_to_cpu(xs->sb_sectsize));
        return 0;
 }

diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
index 774a199e1b51e57034af74579391a9c8d03cdd31..e7ca78c0d5d28215372e02549e1a3dd692cd9f28 100644 (file)
--- a/libblkid/src/superblocks/zfs.c
+++ b/libblkid/src/superblocks/zfs.c
@@ -138,8 +138,10 @@ static void zfs_process_value(blkid_probe pr, char *name, size_t namelen,
                if (nvu_type != DATA_TYPE_UINT64)
                        return;
 
-               if (nvu_value < 32)
+               if (nvu_value < 32){
+                       blkid_probe_set_fsblocksize(pr, 1U << nvu_value);
                        blkid_probe_set_block_size(pr, 1U << nvu_value);
+               }
        }
 }
 

diff --git a/libblkid/src/superblocks/zonefs.c b/libblkid/src/superblocks/zonefs.c
index 4c826ec76e2d06ef273b671ba67fd3594519fa47..2cb7097d4c57118f2fbd57d2167553d12c3a1ec1 100644 (file)
--- a/libblkid/src/superblocks/zonefs.c
+++ b/libblkid/src/superblocks/zonefs.c
@@ -64,6 +64,7 @@ static int probe_zonefs(blkid_probe pr,
                                      sizeof(sb->s_label));
 
        blkid_probe_set_uuid(pr, sb->s_uuid);
+       blkid_probe_set_fsblocksize(pr, ZONEFS_BLOCK_SIZE);
        blkid_probe_set_block_size(pr, ZONEFS_BLOCK_SIZE);
 
        return 0;

diff --git a/tests/expected/blkid/low-probe-befs b/tests/expected/blkid/low-probe-befs
index 5717049d2968419a44dc01483833fc16e0643b9a..738114769fd0e6ac9c182a4a0f217020064f6b6c 100644 (file)
--- a/tests/expected/blkid/low-probe-befs
+++ b/tests/expected/blkid/low-probe-befs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_LABEL=befs_test
 ID_FS_LABEL_ENC=befs_test
 ID_FS_TYPE=befs

diff --git a/tests/expected/blkid/low-probe-btrfs b/tests/expected/blkid/low-probe-btrfs
index 48649389abc63cedf1d60bf3d9ec79999ab5e2ad..a626bc1f6e6629ecb9cb43aa02fabc77d0024039 100644 (file)
--- a/tests/expected/blkid/low-probe-btrfs
+++ b/tests/expected/blkid/low-probe-btrfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_FSLASTBLOCK=29440
 ID_FS_TYPE=btrfs
 ID_FS_USAGE=filesystem

diff --git a/tests/expected/blkid/low-probe-erofs b/tests/expected/blkid/low-probe-erofs
index 1d1600fa08235fc73a4b4fe5d71d3d4c664879f6..b815c7e5d19927aa060d030832743f8e81810312 100644 (file)
--- a/tests/expected/blkid/low-probe-erofs
+++ b/tests/expected/blkid/low-probe-erofs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_TYPE=erofs
 ID_FS_USAGE=filesystem
 ID_FS_UUID=2375febf-f260-479d-ade7-952494047cb4

diff --git a/tests/expected/blkid/low-probe-exfat b/tests/expected/blkid/low-probe-exfat
index 59cb3522545fb647e45229ed0b0f9c48bf212bfa..24d2cac5d8b2d1057e1ecbf0714e339c4d32c92a 100644 (file)
--- a/tests/expected/blkid/low-probe-exfat
+++ b/tests/expected/blkid/low-probe-exfat
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=Новый_том
 ID_FS_LABEL_ENC=Новый\x20том
 ID_FS_TYPE=exfat

diff --git a/tests/expected/blkid/low-probe-ext2 b/tests/expected/blkid/low-probe-ext2
index e236c6e8a42e8e6a871b5496a5f3baeb461f21ac..fa284a949e95a28fdf2d1523378ce2153f6700e4 100644 (file)
--- a/tests/expected/blkid/low-probe-ext2
+++ b/tests/expected/blkid/low-probe-ext2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_FSLASTBLOCK=100
 ID_FS_LABEL=test-ext2
 ID_FS_LABEL_ENC=test-ext2

diff --git a/tests/expected/blkid/low-probe-ext3 b/tests/expected/blkid/low-probe-ext3
index 164fefb7bdd4213381affca4bd62d8d22fd33cb5..422d4fef3d3d23154811bf9ea95a500f5b7fe240 100644 (file)
--- a/tests/expected/blkid/low-probe-ext3
+++ b/tests/expected/blkid/low-probe-ext3
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_FSLASTBLOCK=2048
 ID_FS_LABEL=test-ext3
 ID_FS_LABEL_ENC=test-ext3

diff --git a/tests/expected/blkid/low-probe-f2fs b/tests/expected/blkid/low-probe-f2fs
index 272905125cfef6d42e779a57443c2fae2dcd3c63..1ee751d562afa008d4a682d7c2b5272e8f9b3858 100644 (file)
--- a/tests/expected/blkid/low-probe-f2fs
+++ b/tests/expected/blkid/low-probe-f2fs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=test-f2fs
 ID_FS_LABEL_ENC=test-f2fs
 ID_FS_TYPE=f2fs

diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat
index a463cc987dea2d5c4383b869a53506ba633b3fb1..bb686b24e552be288e83a4dbfbe89c8c609316fd 100644 (file)
--- a/tests/expected/blkid/low-probe-fat
+++ b/tests/expected/blkid/low-probe-fat
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=TEST-FAT
 ID_FS_LABEL_ENC=TEST-FAT
 ID_FS_LABEL_FATBOOT=TEST-FAT

diff --git a/tests/expected/blkid/low-probe-fat16_noheads b/tests/expected/blkid/low-probe-fat16_noheads
index ff9ef2e69ae130e0307bdb28183cb20e2cbd7831..5b8fc916ebc26e2129b1ca16bd4e2c37269cd1fd 100644 (file)
--- a/tests/expected/blkid/low-probe-fat16_noheads
+++ b/tests/expected/blkid/low-probe-fat16_noheads
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=VTech_1070
 ID_FS_LABEL_ENC=VTech\x201070
 ID_FS_SEC_TYPE=msdos

diff --git a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
index ca49f200dee084105e6be7643177618512143bfd..16c5198847fdb3d379055643468574bd7c089fcc 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
+++ b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=___
 ID_FS_LABEL_ENC=\xe5\xe5\xe5
 ID_FS_LABEL_FATBOOT=___

diff --git a/tests/expected/blkid/low-probe-fat32_label_64MB b/tests/expected/blkid/low-probe-fat32_label_64MB
index 4a99f8ff6c88f9f889bd3bfa652fc4c1a076d27f..41b656a84c8de68e5c7078c5df3be54b5ffe90ad 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_label_64MB
+++ b/tests/expected/blkid/low-probe-fat32_label_64MB
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=BINGO
 ID_FS_LABEL_ENC=BINGO
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1
index 5d1771de326857341d3dfca5dc571410bbae3c26..14aee2eb9a31b077853c9afcfebd83c292d4ebee 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=label1
 ID_FS_LABEL_ENC=label1
 ID_FS_LABEL_FATBOOT=label1

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME
index c13af90214687bbdd980c902be2e8635a76add70..1891157edcb7732035bb679d599c4e8825323839 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=NO_NAME
 ID_FS_LABEL_ENC=NO\x20NAME
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty
index 73c553e5435cc230e352897681c11aba31642b8e..206782fa9c58103e9930433cd59312025fb859a7 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_TYPE=vfat
 ID_FS_USAGE=filesystem
 ID_FS_UUID=92B4-BA66

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2
index 4b8146208aff94fb003b6caed54c6254d0056515..cf635a2186aba2ee0479592b262cce5ecf1d4f75 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=label2
 ID_FS_LABEL_ENC=label2
 ID_FS_LABEL_FATBOOT=label2

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME
index c13af90214687bbdd980c902be2e8635a76add70..1891157edcb7732035bb679d599c4e8825323839 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=NO_NAME
 ID_FS_LABEL_ENC=NO\x20NAME
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase
index 73c553e5435cc230e352897681c11aba31642b8e..206782fa9c58103e9930433cd59312025fb859a7 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_TYPE=vfat
 ID_FS_USAGE=filesystem
 ID_FS_UUID=92B4-BA66

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase
index 075278de4d32cfc6967dc5eac6a6c13761981c22..6088d17be248337e00aaf6757db537da9266ed00 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL_FATBOOT=label1
 ID_FS_LABEL_FATBOOT_ENC=label1
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2
index fe4884d286417fbb3716bd8991bb46f948ab5e59..802a66f14c0b3ee5d3498bea278e3387d581f448 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LABEL2
 ID_FS_LABEL_ENC=LABEL2
 ID_FS_LABEL_FATBOOT=label1

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none b/tests/expected/blkid/low-probe-fat32_mkdosfs_none
index 5475176163173ff15dba87a042b900b7a5585abc..66a7923ed7bfcef64a35eee5053db4d1921a9362 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_TYPE=vfat
 ID_FS_USAGE=filesystem
 ID_FS_UUID=E6B8-AF8C

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME
index 5475176163173ff15dba87a042b900b7a5585abc..66a7923ed7bfcef64a35eee5053db4d1921a9362 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_TYPE=vfat
 ID_FS_USAGE=filesystem
 ID_FS_UUID=E6B8-AF8C

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1
index dfacd9b6aa479b743582353440ab3c49e40a557d..e45da35d827dff05075fddccbb65ad71797122b4 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL_FATBOOT=label1
 ID_FS_LABEL_FATBOOT_ENC=label1
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2
index 142259c8764037f83d9117529abf8df88cf63926..ad2bf8fda7433be81500b06926de23bbb1b9033d 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LABEL2
 ID_FS_LABEL_ENC=LABEL2
 ID_FS_LABEL_FATBOOT=label1

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1
index d1360ada069176e798a731eed10abe480fbf07b4..a5e49006409be9980d216b6c5a3cd35ecd8f24cd 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LABEL1
 ID_FS_LABEL_ENC=LABEL1
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2
index c078359c6d9fce7436cb59366eec5fe6ae5b89ee..e3473b9cc583c4971d9ce6d8d86fe759339cd617 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=label2
 ID_FS_LABEL_ENC=label2
 ID_FS_LABEL_FATBOOT=label2

diff --git a/tests/expected/blkid/low-probe-fat32_xp_label1 b/tests/expected/blkid/low-probe-fat32_xp_label1
index 8a27d7e1c236449559646acb32e5a4509373ff15..9a82d11c2b744737d09a13709a3bebedfdc18300 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_xp_label1
+++ b/tests/expected/blkid/low-probe-fat32_xp_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LABEL1
 ID_FS_LABEL_ENC=LABEL1
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_xp_none b/tests/expected/blkid/low-probe-fat32_xp_none
index f8271c2b701ecc121778f459a2ff9cf94cc8170b..b4d6f4fdf8e8b279328859f40201c8fa7d2b5cdf 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_xp_none
+++ b/tests/expected/blkid/low-probe-fat32_xp_none
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_TYPE=vfat
 ID_FS_USAGE=filesystem
 ID_FS_UUID=54B6-DC94

diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1
index fdc5eb6f6b2de83bf9a807679de8e653dd0bd28f..560b394a092584eb34b6d4ae1ab60a6047d09824 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1
+++ b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL_FATBOOT=label1
 ID_FS_LABEL_FATBOOT_ENC=label1
 ID_FS_TYPE=vfat

diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1
index 74f271519ee00a6f63bdbb6da2cceef363c6804c..1b0a87806fe7a69b674c91a71c04ae7bc1aaf8eb 100644 (file)
--- a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1
+++ b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LABEL1
 ID_FS_LABEL_ENC=LABEL1
 ID_FS_LABEL_FATBOOT=LABEL1

diff --git a/tests/expected/blkid/low-probe-gfs2 b/tests/expected/blkid/low-probe-gfs2
index f04529bc0d1861febff699f65e36600b1f55eb5d..8b2840f4160f6038d64cbe94730f26fe6dcd52f3 100644 (file)
--- a/tests/expected/blkid/low-probe-gfs2
+++ b/tests/expected/blkid/low-probe-gfs2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=mycluster:mygfs2
 ID_FS_LABEL_ENC=mycluster:mygfs2
 ID_FS_TYPE=gfs2

diff --git a/tests/expected/blkid/low-probe-hfsplus b/tests/expected/blkid/low-probe-hfsplus
index cc351a0420e915ed0213225256e4f91db2881c5d..07e60ea25e7fb339c02ec1203170f68d6a07a3f6 100644 (file)
--- a/tests/expected/blkid/low-probe-hfsplus
+++ b/tests/expected/blkid/low-probe-hfsplus
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=123456789ABCDE
 ID_FS_LABEL_ENC=123456789ABCDE
 ID_FS_TYPE=hfsplus

diff --git a/tests/expected/blkid/low-probe-hpfs b/tests/expected/blkid/low-probe-hpfs
index 7e4a12b977876d13993292e6aa17132aa7076cf3..a6198c64019f710b4337103dd7f69d62ad35fa33 100644 (file)
--- a/tests/expected/blkid/low-probe-hpfs
+++ b/tests/expected/blkid/low-probe-hpfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=P01_S16A
 ID_FS_LABEL_ENC=P01\x20S16A
 ID_FS_TYPE=hpfs

diff --git a/tests/expected/blkid/low-probe-iso b/tests/expected/blkid/low-probe-iso
index 5c8a3d0fd8840f7d2883f26afbe0927e86173cc8..3e9be8f985231c9c6bca0bcdf9d2b1fd5c1b4618 100644 (file)
--- a/tests/expected/blkid/low-probe-iso
+++ b/tests/expected/blkid/low-probe-iso
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=IsoVolumeName
 ID_FS_LABEL_ENC=IsoVolumeName
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-different-iso-joliet-label b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label
index f618d024d539f13a822b778dd5c11e63e9ae1d11..34663a358147f593ac79088118a059b55c38587b 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-different-iso-joliet-label
+++ b/tests/expected/blkid/low-probe-iso-different-iso-joliet-label
@@ -1,6 +1,7 @@
 ID_FS_APPLICATION_ID=Joliet\x20Application
 ID_FS_BLOCK_SIZE=2048
 ID_FS_DATA_PREPARER_ID=Joliet\x20Preparer
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=Joliet_Label
 ID_FS_LABEL_ENC=Joliet\x20Label
 ID_FS_PUBLISHER_ID=Joliet\x20Publisher

diff --git a/tests/expected/blkid/low-probe-iso-joliet b/tests/expected/blkid/low-probe-iso-joliet
index e97dbde3c47412a1383c051e8fa0a8315881b68f..c92484a75b01a6e40c1deac91e906cb60a65e390 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-joliet
+++ b/tests/expected/blkid/low-probe-iso-joliet
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=ThisWonderfulLabelIsVeryVeryLong
 ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-0 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-0
index d8217f5299fff776ed4687004d22b2d5e790865d..eed747e489c0c2b28543a2f016d98f0225d1d9cf 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-0
+++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-0
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=first_session
 ID_FS_LABEL_ENC=first\x20session
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-174 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-174
index 9c18d0dde22eca9c1ba5076fe138e7008bf11786..aa71cff78f56b31ada675caabb843b5537af8eb8 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-174
+++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-174
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=second_session
 ID_FS_LABEL_ENC=second\x20session
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-multi-genisoimage-348 b/tests/expected/blkid/low-probe-iso-multi-genisoimage-348
index 7e3c5ba01cd47704d121ce169dc9d6518eecf950..caf2010a5ed6a8ce063ee3c32d2bcba187f1c9b9 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-multi-genisoimage-348
+++ b/tests/expected/blkid/low-probe-iso-multi-genisoimage-348
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=third_session
 ID_FS_LABEL_ENC=third\x20session
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-rr-joliet b/tests/expected/blkid/low-probe-iso-rr-joliet
index 711e04bbc4b41f7addae0a17f40b0804c3e783e7..fdfc69616d53be47d55daa0608759f6f7b7b1a73 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-rr-joliet
+++ b/tests/expected/blkid/low-probe-iso-rr-joliet
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=GENISOIMAGE\x20ISO\x209660\x2fHFS\x20FILESYSTEM\x20CREATOR\x20\x28C\x29\x201993\x20E.YOUNGDALE\x20\x28C\x29\x201997-2006\x20J.PEARSON\x2fJ.SCHILLING\x20\x28C\x29\x202006-2007\x20CDRKIT\x20TEAM
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=ThisIsVolumeName
 ID_FS_LABEL_ENC=ThisIsVolumeName
 ID_FS_SYSTEM_ID=LINUX

diff --git a/tests/expected/blkid/low-probe-iso-unicode-long-label b/tests/expected/blkid/low-probe-iso-unicode-long-label
index 270ee848901136ba7f755cdf64c704622de54c2d..11403fdb0ac1b4ae90762ab2f3c882226ff9c1ba 100644 (file)
--- a/tests/expected/blkid/low-probe-iso-unicode-long-label
+++ b/tests/expected/blkid/low-probe-iso-unicode-long-label
@@ -1,6 +1,7 @@
 ID_FS_APPLICATION_ID=Nero\x20Linux
 ID_FS_BLOCK_SIZE=2048
 ID_FS_DATA_PREPARER_ID=Naïve\x20and\x20very\x20looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG\x20DATA\x20PREPARER
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=Naïve_and_very_lOOOOOOOONG_LABEL
 ID_FS_LABEL_ENC=Naïve\x20and\x20very\x20lOOOOOOOONG_LABEL
 ID_FS_PUBLISHER_ID=Naïve\x20and\x20very\x20looooooooooooooooooooooooooooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG\x20PUBLISHER

diff --git a/tests/expected/blkid/low-probe-jbd b/tests/expected/blkid/low-probe-jbd
index f5462a2a3e23c51a09bcf8deadcaf30e40ea6f66..36c7d4062e3c1d57acc576bc9e29d10724a769b4 100644 (file)
--- a/tests/expected/blkid/low-probe-jbd
+++ b/tests/expected/blkid/low-probe-jbd
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_FSLASTBLOCK=1024
 ID_FS_LOGUUID=0d7a07df-7b06-4829-bce7-3b9c3ece570c
 ID_FS_TYPE=jbd

diff --git a/tests/expected/blkid/low-probe-jfs b/tests/expected/blkid/low-probe-jfs
index ac7d31bacaa5b1a4173a79f62fa0c99523b1aa9b..ee6e1ead87d4407614dbac429e987bbc5f8ed3e4 100644 (file)
--- a/tests/expected/blkid/low-probe-jfs
+++ b/tests/expected/blkid/low-probe-jfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=test-jfs
 ID_FS_LABEL_ENC=test-jfs
 ID_FS_TYPE=jfs

diff --git a/tests/expected/blkid/low-probe-minix-BE b/tests/expected/blkid/low-probe-minix-BE
index f73f1b5db518aab5096373b167e2985531648b49..c6da3c195f0c4c74e3d5c97e7fca025868be24ea 100644 (file)
--- a/tests/expected/blkid/low-probe-minix-BE
+++ b/tests/expected/blkid/low-probe-minix-BE
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_TYPE=minix
 ID_FS_USAGE=filesystem
 ID_FS_VERSION=1

diff --git a/tests/expected/blkid/low-probe-minix-LE b/tests/expected/blkid/low-probe-minix-LE
index f73f1b5db518aab5096373b167e2985531648b49..c6da3c195f0c4c74e3d5c97e7fca025868be24ea 100644 (file)
--- a/tests/expected/blkid/low-probe-minix-LE
+++ b/tests/expected/blkid/low-probe-minix-LE
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_TYPE=minix
 ID_FS_USAGE=filesystem
 ID_FS_VERSION=1

diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2
index ff27e0b237d25264dabc5a75a4e5ad92f6839fe4..4bd466552809ac8b68493a5ac787788db5e3b9e2 100644 (file)
--- a/tests/expected/blkid/low-probe-nilfs2
+++ b/tests/expected/blkid/low-probe-nilfs2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=test-nilfs2
 ID_FS_LABEL_ENC=test-nilfs2
 ID_FS_TYPE=nilfs2

diff --git a/tests/expected/blkid/low-probe-ntfs b/tests/expected/blkid/low-probe-ntfs
index 790157aaa04bda9e54efa2abf2707c2ae2d90288..64722f2a7f35537488e94788b491a0ae02f07975 100644 (file)
--- a/tests/expected/blkid/low-probe-ntfs
+++ b/tests/expected/blkid/low-probe-ntfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=Новый_том
 ID_FS_LABEL_ENC=Новый\x20том
 ID_FS_TYPE=ntfs

diff --git a/tests/expected/blkid/low-probe-ocfs2 b/tests/expected/blkid/low-probe-ocfs2
index 9b84dbe67df850c52ca28bca3cc7499bad1e2591..99189f39fceed659556e0213b8296c7a8630c649 100644 (file)
--- a/tests/expected/blkid/low-probe-ocfs2
+++ b/tests/expected/blkid/low-probe-ocfs2
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_LABEL=test-ocfs2
 ID_FS_LABEL_ENC=test-ocfs2
 ID_FS_TYPE=ocfs2

diff --git a/tests/expected/blkid/low-probe-reiser3 b/tests/expected/blkid/low-probe-reiser3
index 1c4b1478dc6916715392167fbc38d5b7ac0bc17c..3ae71201c2c76797ec255616f23465ab1edc88b8 100644 (file)
--- a/tests/expected/blkid/low-probe-reiser3
+++ b/tests/expected/blkid/low-probe-reiser3
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=TESTREISER
 ID_FS_LABEL_ENC=TESTREISER
 ID_FS_TYPE=reiserfs

diff --git a/tests/expected/blkid/low-probe-reiser4 b/tests/expected/blkid/low-probe-reiser4
index 66df064fd360f04ca5986a4d4be40e56728ce0d7..f8896bb579248ab9309f2e3baed117a9cbd5c883 100644 (file)
--- a/tests/expected/blkid/low-probe-reiser4
+++ b/tests/expected/blkid/low-probe-reiser4
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=TESTR4
 ID_FS_LABEL_ENC=TESTR4
 ID_FS_TYPE=reiser4

diff --git a/tests/expected/blkid/low-probe-romfs b/tests/expected/blkid/low-probe-romfs
index b56a6b88143a4dc9fe1f12d68079512e53b05cd7..2c606ecc15574a60384e56830464a381a8e8ea82 100644 (file)
--- a/tests/expected/blkid/low-probe-romfs
+++ b/tests/expected/blkid/low-probe-romfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_LABEL=test-romfs
 ID_FS_LABEL_ENC=test-romfs
 ID_FS_TYPE=romfs

diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32
index d9c63c7102b8b563b3e4e1cf4ae04ed6e105eb47..e6ffb6550762e4a4e3bde34db2cfbd415cb97b35 100644 (file)
--- a/tests/expected/blkid/low-probe-small-fat32
+++ b/tests/expected/blkid/low-probe-small-fat32
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=TESTVFAT
 ID_FS_LABEL_ENC=TESTVFAT
 ID_FS_LABEL_FATBOOT=TESTVFAT

diff --git a/tests/expected/blkid/low-probe-udf b/tests/expected/blkid/low-probe-udf
index b00ae7b8a133672186c21951c29e1650be8a607a..d8cd25bbf77944257a132d567281190304efaae6 100644 (file)
--- a/tests/expected/blkid/low-probe-udf
+++ b/tests/expected/blkid/low-probe-udf
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=genisoimage
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=test-udf
 ID_FS_LABEL_ENC=test-udf
 ID_FS_LOGICAL_VOLUME_ID=test-udf

diff --git a/tests/expected/blkid/low-probe-udf-bdr-2.60-nero b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero
index 006499223ae82693fa3dbe0d6662e4a6d46881d8..677c2a3531652897f2ad0205b50b68af2c78b2b3 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-bdr-2.60-nero
+++ b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Nero
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208 b/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208
index 649e5be9484f665ef866d4f0be9f5f3ccbb2df2b..924d78f7d153522d4df386a787b71791124cbd1b 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208
+++ b/tests/expected/blkid/low-probe-udf-cd-mkudfiso-20100208
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=mkudfiso
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=Volume_Label
 ID_FS_LABEL_ENC=Volume\x20Label
 ID_FS_LOGICAL_VOLUME_ID=Volume\x20Label

diff --git a/tests/expected/blkid/low-probe-udf-cd-nero-6 b/tests/expected/blkid/low-probe-udf-cd-nero-6
index 7474bc4db21099b28f32ad7424bf4754c980a73c..bc1b5fe8596602951ff1d0bcc6caf7824be43c12 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-cd-nero-6
+++ b/tests/expected/blkid/low-probe-udf-cd-nero-6
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Nero
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=UDF_Label
 ID_FS_LABEL_ENC=UDF\x20Label
 ID_FS_LOGICAL_VOLUME_ID=UDF\x20Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096 b/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096
index 152877a133711d77fb9cdd40eb2bdeb6fe66b046..c8e5ac3961639ca1fdea37c19d76a23745a397a7 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096
+++ b/tests/expected/blkid/low-probe-udf-hdd-macosx-2.60-4096
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Mac\x20OS\x20X\x20udf\x20newfs_udf
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=Untitled_UDF_Volume
 ID_FS_LABEL_ENC=Untitled\x20UDF\x20Volume
 ID_FS_LOGICAL_VOLUME_ID=Untitled\x20UDF\x20Volume

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1
index 930259204d2532cb4910e9264536d7400bad3bcd..0f073c007e4a05594ffa1188bba2793ed6ab9b58 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-1
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LinuxUDF
 ID_FS_LABEL_ENC=LinuxUDF
 ID_FS_LOGICAL_VOLUME_ID=LinuxUDF

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2
index a0fdb2ee2479fbee0bd6ec96f3629152c77d3e81..c55e233265a5a5bc7368ec29523a7d0333000f51 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.0.0-2
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1
index ef36b84e0d86357b7744affe9ab24d4284b13560..37586914c5b93712656266a3e1e85b964674ad84 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-1
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2
index 58a8bf6125fd68092972578a5fe1e52589d1f6ae..521e0ff1213b11d8e36eca83be8704fe4726899a 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-2
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3
index 0e1e7706b5433605aa12b491bc70b23c510b4600..e720867bd63cf65d84f965488a848ebe19158da6 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-3
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=ÿ
 ID_FS_LABEL_ENC=ÿ
 ID_FS_LOGICAL_VOLUME_ID=ÿ

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4
index 00561717d0e6b4a75e90b229c549846afd79ed3f..ecd8c3c9fb8ec93a2c1daa99ff7a00cbd7275fc6 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-4
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=1024
+ID_FS_FSBLOCKSIZE=1024
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5
index 69ee62f97d29876ce2fd6299f69bae48696933f3..df2d901f5480e67788cfa5847f6b32bdac63e50d 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-5
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=Label
 ID_FS_LABEL_ENC=Label
 ID_FS_LOGICAL_VOLUME_ID=Label

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6
index 2d3876b7ebbd22b4e7f63f64cc43ece07a4e9406..aba8d2e48e4c9a873d7184d4c7db16d648f59c8b 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-6
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 ID_FS_LABEL_ENC=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 ID_FS_LOGICAL_VOLUME_ID=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7
index e60bf179351c1c4cd5cd1a13acae1db6ef15c449..67faf3424af3b93209b7b57a5fac37a0ef392786 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-7
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_LABEL=Label4096
 ID_FS_LABEL_ENC=Label4096
 ID_FS_LOGICAL_VOLUME_ID=Label4096

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8
index 07857824281afc781c65f5fdb308422d71c35a96..11a3bde27d91528e367767f5bd00acfacef9cce8 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-1.3-8
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=LinuxUDF
 ID_FS_LABEL_ENC=LinuxUDF
 ID_FS_LOGICAL_VOLUME_ID=LinuxUDF

diff --git a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2 b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2
index 77300512acb23ee18454b93e916330519da45f94..c61e8b5eb852a1e214be936c1b26fe6fa8c10d65 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2
+++ b/tests/expected/blkid/low-probe-udf-hdd-mkudffs-2.2
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=😀
 ID_FS_LABEL_ENC=😀
 ID_FS_LOGICAL_VOLUME_ID=😀

diff --git a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5 b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5
index 6cb1ffeee38da46ef745ecaf981097be219deffc..c173bb8d6bcbc2243b19729801fe460418d9d0f1 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5
+++ b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.5
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=UDFtoolkit
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=discname
 ID_FS_LABEL_ENC=discname
 ID_FS_LOGICAL_VOLUME_ID=discname

diff --git a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7 b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7
index 7a35e0f0d9136c1661c28dcad3b949a1da440ab2..4c71a0cce1937990058faf6a63e8f43b3b42c31f 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7
+++ b/tests/expected/blkid/low-probe-udf-hdd-udfclient-0.7.7
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=UDFtoolkit
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=discname
 ID_FS_LABEL_ENC=discname
 ID_FS_LOGICAL_VOLUME_ID=discname

diff --git a/tests/expected/blkid/low-probe-udf-hdd-win7 b/tests/expected/blkid/low-probe-udf-hdd-win7
index ad9616bc7ca886c365350eed05811727e695c583..eafa7f019c2e887bb83c27a913142257426c1479 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-hdd-win7
+++ b/tests/expected/blkid/low-probe-udf-hdd-win7
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Microsoft\x20Windows
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=My_volume_label
 ID_FS_LABEL_ENC=My\x20volume\x20label
 ID_FS_LOGICAL_VOLUME_ID=My\x20volume\x20label

diff --git a/tests/expected/blkid/low-probe-udf-multi-genisoimage-0 b/tests/expected/blkid/low-probe-udf-multi-genisoimage-0
index f598baaa069d57923fb157b6f43b7643c5b97120..5eeb78d335f6a14c271c9d8053788fb88c21cd04 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-genisoimage-0
+++ b/tests/expected/blkid/low-probe-udf-multi-genisoimage-0
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=genisoimage
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=first_session
 ID_FS_LABEL_ENC=first\x20session
 ID_FS_LOGICAL_VOLUME_ID=first\x20session

diff --git a/tests/expected/blkid/low-probe-udf-multi-genisoimage-417 b/tests/expected/blkid/low-probe-udf-multi-genisoimage-417
index bb4d8c72f3eef348fd324deeec2723469fd6465e..5d2c7843f88f5a892ce3af9ef28a84cd110c32e4 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-genisoimage-417
+++ b/tests/expected/blkid/low-probe-udf-multi-genisoimage-417
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=genisoimage
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=second_session
 ID_FS_LABEL_ENC=second\x20session
 ID_FS_LOGICAL_VOLUME_ID=second\x20session

diff --git a/tests/expected/blkid/low-probe-udf-multi-genisoimage-834 b/tests/expected/blkid/low-probe-udf-multi-genisoimage-834
index bc4dcba65b96ff79b1e668d60b5cf43cf35bf20f..aa7a1630a38ccf95a12a8b293fe2a3cb0286c4b7 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-genisoimage-834
+++ b/tests/expected/blkid/low-probe-udf-multi-genisoimage-834
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=genisoimage
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=third_session
 ID_FS_LABEL_ENC=third\x20session
 ID_FS_LOGICAL_VOLUME_ID=third\x20session

diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-0 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-0
index 07557d7ca4de66d3a28f4e8e688f3f67217a9644..a1a234e89db70e806d22ec27c3c5f2c8f607421b 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-0
+++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-0
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=first_session
 ID_FS_LABEL_ENC=first\x20session
 ID_FS_LOGICAL_VOLUME_ID=first\x20session

diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-320 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-320
index 458cf3e23e3194c203b00da79708a370718b7bcb..84285894df9f34f4809f70c1246ca4600bd8334a 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-320
+++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-320
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=second_session
 ID_FS_LABEL_ENC=second\x20session
 ID_FS_LOGICAL_VOLUME_ID=second\x20session

diff --git a/tests/expected/blkid/low-probe-udf-multi-mkudffs-640 b/tests/expected/blkid/low-probe-udf-multi-mkudffs-640
index 04cc4f11c69d63c00167de1446a49c84a8e71ab6..59c914280b0de23d980166b79f2efc910c253ef2 100644 (file)
--- a/tests/expected/blkid/low-probe-udf-multi-mkudffs-640
+++ b/tests/expected/blkid/low-probe-udf-multi-mkudffs-640
@@ -1,5 +1,6 @@
 ID_FS_APPLICATION_ID=Linux\x20mkudffs
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_LABEL=third_session
 ID_FS_LABEL_ENC=third\x20session
 ID_FS_LOGICAL_VOLUME_ID=third\x20session

diff --git a/tests/expected/blkid/low-probe-ufs b/tests/expected/blkid/low-probe-ufs
index 256f065d29ef7b3ca61a5122f24e38de7796f0a4..d771bc8d5744774e7660c04d95eacf8f06058ca7 100644 (file)
--- a/tests/expected/blkid/low-probe-ufs
+++ b/tests/expected/blkid/low-probe-ufs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=2048
+ID_FS_FSBLOCKSIZE=2048
 ID_FS_TYPE=ufs
 ID_FS_USAGE=filesystem
 ID_FS_UUID=4b0e640aec56ac70

diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs
index be9c4194a837ba333b6a77c93e89245a60f49ba0..0eb803f526c8a4dd1d4a70a12f99aec9479133bc 100644 (file)
--- a/tests/expected/blkid/low-probe-xfs
+++ b/tests/expected/blkid/low-probe-xfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_FSLASTBLOCK=4096
 ID_FS_FSSIZE=11862016
 ID_FS_LABEL=test-xfs

diff --git a/tests/expected/blkid/low-probe-xfs-v5 b/tests/expected/blkid/low-probe-xfs-v5
index fd2cba933d9d91376c52754883e47defbe954282..7525b088890fd3c5f832bd5d0f225a2e69a848a4 100644 (file)
--- a/tests/expected/blkid/low-probe-xfs-v5
+++ b/tests/expected/blkid/low-probe-xfs-v5
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_FSLASTBLOCK=5120
 ID_FS_FSSIZE=17469440
 ID_FS_LABEL=test-xfs-v5

diff --git a/tests/expected/blkid/low-probe-zfs b/tests/expected/blkid/low-probe-zfs
index 0e7af2866623c245e59ea909181cd50e6837f8ec..f7e481b545a210fe2673a72d54830664ce66e942 100644 (file)
--- a/tests/expected/blkid/low-probe-zfs
+++ b/tests/expected/blkid/low-probe-zfs
@@ -1,4 +1,5 @@
 ID_FS_BLOCK_SIZE=512
+ID_FS_FSBLOCKSIZE=512
 ID_FS_LABEL=tank
 ID_FS_LABEL_ENC=tank
 ID_FS_TYPE=zfs_member

diff --git a/tests/expected/blkid/low-probe-zonefs b/tests/expected/blkid/low-probe-zonefs
index cc15459a154a3706e487e069afce644b4347162f..59c86f3fd59ab877382bd57361464627197f406f 100644 (file)
--- a/tests/expected/blkid/low-probe-zonefs
+++ b/tests/expected/blkid/low-probe-zonefs
@@ -1,3 +1,4 @@
 ID_FS_BLOCK_SIZE=4096
+ID_FS_FSBLOCKSIZE=4096
 ID_FS_TYPE=zonefs
 ID_FS_USAGE=filesystem