From d3b7b882aef42f9399aa7990eda0a6c7b0e3540f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 30 Nov 2022 03:38:16 +0100 Subject: [PATCH] libblkid: f2fs: report fssize --- libblkid/src/superblocks/f2fs.c | 6 ++++-- tests/expected/blkid/low-probe-f2fs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libblkid/src/superblocks/f2fs.c b/libblkid/src/superblocks/f2fs.c index ce796098ae..980111ef37 100644 --- a/libblkid/src/superblocks/f2fs.c +++ b/libblkid/src/superblocks/f2fs.c @@ -110,8 +110,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){ - 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)); + uint32_t blocksize = 1U << le32_to_cpu(sb->log_blocksize); + blkid_probe_set_fsblocksize(pr, blocksize); + blkid_probe_set_block_size(pr, blocksize); + blkid_probe_set_fssize(pr, le64_to_cpu(sb->block_count) * blocksize); } return 0; } diff --git a/tests/expected/blkid/low-probe-f2fs b/tests/expected/blkid/low-probe-f2fs index 77f93277a7..d1c01674cc 100644 --- a/tests/expected/blkid/low-probe-f2fs +++ b/tests/expected/blkid/low-probe-f2fs @@ -1,5 +1,6 @@ ID_FS_BLOCK_SIZE=4096 ID_FS_FSBLOCKSIZE=4096 +ID_FS_FSSIZE=148897792 ID_FS_LABEL=test-f2fs ID_FS_LABEL_ENC=test-f2fs ID_FS_TYPE=f2fs -- 2.47.3