From: Karel Zak Date: Mon, 6 Jun 2022 10:14:10 +0000 (+0200) Subject: libblkid: minor changes to coding style X-Git-Tag: v2.39-rc1~638 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065c8acf6e4987d2394e05b191977926bd31cb23;p=thirdparty%2Futil-linux.git libblkid: minor changes to coding style Signed-off-by: Karel Zak --- diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c index f286c0e64d..6e3fb71e40 100644 --- a/libblkid/src/superblocks/btrfs.c +++ b/libblkid/src/superblocks/btrfs.c @@ -241,11 +241,13 @@ static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag) __builtin_clz(le32_to_cpu(bfs->sectorsize)); blkid_probe_set_fslastblock(pr, le64_to_cpu(bfs->total_bytes) >> sectorsize_log); - // The size is calculated without the RAID factor. It could not be - // obtained from the superblock as it is property of device tree. - // Without the factor we would show fs size with the redundant data. The - // acquisition of the factor will require additional parsing of btrfs - // tree. + + /* The size is calculated without the RAID factor. It could not be + * obtained from the superblock as it is property of device tree. + * Without the factor we would show fs size with the redundant data. The + * acquisition of the factor will require additional parsing of btrfs + * tree. + */ blkid_probe_set_fssize(pr, le64_to_cpu(bfs->total_bytes)); return 0; diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c index 96bb31e49a..e6d620167a 100644 --- a/libblkid/src/superblocks/ext.c +++ b/libblkid/src/superblocks/ext.c @@ -199,12 +199,14 @@ static void ext_get_info(blkid_probe pr, int ver, struct ext2_super_block *es) ((s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? (uint64_t) le32_to_cpu(es->s_blocks_count_hi) << 32 : 0); blkid_probe_set_fslastblock(pr, fslastblock); - // The total number of blocks is taken without substraction of overhead - // (journal, metadata). The ext4 has non-trivial overhead calculation - // viz. ext4_calculate_overhead(). Thefore, the FSSIZE would show number - // slightly higher than the real value (for example, calculated via - // statfs()). - uint64_t fssize = (uint64_t)block_size*le32_to_cpu(es->s_blocks_count); + + /* The total number of blocks is taken without substraction of overhead + * (journal, metadata). The ext4 has non-trivial overhead calculation + * viz. ext4_calculate_overhead(). Thefore, the FSSIZE would show number + * slightly higher than the real value (for example, calculated via + * statfs()). + */ + uint64_t fssize = (uint64_t) block_size * le32_to_cpu(es->s_blocks_count); blkid_probe_set_fssize(pr, fssize); }