|
 |
dbeef3 |
From e81cc68312e91ab7086188542f3377605bf144a8 Mon Sep 17 00:00:00 2001
|
|
|
dbeef3 |
From: Andrey Albershteyn <aalbersh@redhat.com>
|
|
|
dbeef3 |
Date: Mon, 25 Apr 2022 17:08:38 +0200
|
|
|
dbeef3 |
Subject: libblkid: implement FSSIZE calculation for XFS
|
|
|
dbeef3 |
|
|
|
dbeef3 |
The implementation is similar to one provided by statfs(2) + lsblk.
|
|
|
dbeef3 |
|
|
|
dbeef3 |
Upstream: http://github.com/util-linux/util-linux/commit/d7ec8fe8e
|
|
|
dbeef3 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2064810
|
|
|
dbeef3 |
Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
|
|
|
dbeef3 |
---
|
|
|
dbeef3 |
libblkid/src/superblocks/xfs.c | 10 ++++++++++
|
|
|
dbeef3 |
1 file changed, 10 insertions(+)
|
|
|
dbeef3 |
|
|
|
dbeef3 |
diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
|
|
|
dbeef3 |
index d8c6fb6d4..444050f55 100644
|
|
|
dbeef3 |
--- a/libblkid/src/superblocks/xfs.c
|
|
|
dbeef3 |
+++ b/libblkid/src/superblocks/xfs.c
|
|
|
dbeef3 |
@@ -158,6 +158,15 @@ static int xfs_verify_sb(struct xfs_super_block *ondisk)
|
|
|
dbeef3 |
return 1;
|
|
|
dbeef3 |
}
|
|
|
dbeef3 |
|
|
|
dbeef3 |
+static uint64_t xfs_fssize(struct xfs_super_block *xs)
|
|
|
dbeef3 |
+{
|
|
|
dbeef3 |
+ uint32_t lsize = xs->sb_logstart ? xs->sb_logblocks : 0;
|
|
|
dbeef3 |
+ uint64_t avail_blocks = be64_to_cpu(xs->sb_dblocks) - be32_to_cpu(lsize);
|
|
|
dbeef3 |
+ uint64_t fssize = avail_blocks*be32_to_cpu(xs->sb_blocksize);
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ return fssize;
|
|
|
dbeef3 |
+}
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
|
|
|
dbeef3 |
{
|
|
|
dbeef3 |
struct xfs_super_block *xs;
|
|
|
dbeef3 |
@@ -173,6 +182,7 @@ static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
|
|
|
dbeef3 |
blkid_probe_set_label(pr, (unsigned char *) xs->sb_fname,
|
|
|
dbeef3 |
sizeof(xs->sb_fname));
|
|
|
dbeef3 |
blkid_probe_set_uuid(pr, xs->sb_uuid);
|
|
|
dbeef3 |
+ blkid_probe_set_fssize(pr, xfs_fssize(xs));
|
|
|
dbeef3 |
blkid_probe_set_block_size(pr, be16_to_cpu(xs->sb_sectsize));
|
|
|
dbeef3 |
return 0;
|
|
|
dbeef3 |
}
|
|
|
dbeef3 |
--
|
|
|
dbeef3 |
2.36.1
|
|
|
dbeef3 |
|