|
 |
dbeef3 |
From d3d0e6dc70889e5fe9d9dfeab67e9ba1f0491a28 Mon Sep 17 00:00:00 2001
|
|
|
dbeef3 |
From: Andrey Albershteyn <aalbersh@redhat.com>
|
|
|
dbeef3 |
Date: Mon, 25 Apr 2022 17:08:39 +0200
|
|
|
dbeef3 |
Subject: blkid: add FSSIZE tag with tests for XFS
|
|
|
dbeef3 |
|
|
|
dbeef3 |
The FSSIZE tag was added to the libblkid. Enable this tag in blkid
|
|
|
dbeef3 |
and update tests golden output for XFS test cases.
|
|
|
dbeef3 |
|
|
|
dbeef3 |
Upstream: http://github.com/util-linux/util-linux/commit/60cedc921
|
|
|
dbeef3 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2064810
|
|
|
dbeef3 |
Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
|
|
|
dbeef3 |
---
|
|
|
dbeef3 |
misc-utils/blkid.c | 3 ++-
|
|
|
dbeef3 |
tests/expected/blkid/low-probe-xfs | 1 +
|
|
|
dbeef3 |
tests/expected/blkid/low-probe-xfs-v5 | 1 +
|
|
|
dbeef3 |
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
dbeef3 |
|
|
|
dbeef3 |
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
|
|
|
dbeef3 |
index cccd8af87..4f456be52 100644
|
|
|
dbeef3 |
--- a/misc-utils/blkid.c
|
|
|
dbeef3 |
+++ b/misc-utils/blkid.c
|
|
|
dbeef3 |
@@ -892,7 +892,8 @@ int main(int argc, char **argv)
|
|
|
dbeef3 |
blkid_probe_set_superblocks_flags(pr,
|
|
|
dbeef3 |
BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
|
|
|
dbeef3 |
BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE |
|
|
|
dbeef3 |
- BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION);
|
|
|
dbeef3 |
+ BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION |
|
|
|
dbeef3 |
+ BLKID_SUBLKS_FSSIZE);
|
|
|
dbeef3 |
|
|
|
dbeef3 |
|
|
|
dbeef3 |
if (fltr_usage &&
|
|
|
dbeef3 |
diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs
|
|
|
dbeef3 |
index 6eb1b4600..a91e92bcc 100644
|
|
|
dbeef3 |
--- a/tests/expected/blkid/low-probe-xfs
|
|
|
dbeef3 |
+++ b/tests/expected/blkid/low-probe-xfs
|
|
|
dbeef3 |
@@ -1,4 +1,5 @@
|
|
|
dbeef3 |
ID_FS_BLOCK_SIZE=512
|
|
|
dbeef3 |
+ID_FS_FSSIZE=11862016
|
|
|
dbeef3 |
ID_FS_LABEL=test-xfs
|
|
|
dbeef3 |
ID_FS_LABEL_ENC=test-xfs
|
|
|
dbeef3 |
ID_FS_TYPE=xfs
|
|
|
dbeef3 |
diff --git a/tests/expected/blkid/low-probe-xfs-v5 b/tests/expected/blkid/low-probe-xfs-v5
|
|
|
dbeef3 |
index 513a3818f..129b41f26 100644
|
|
|
dbeef3 |
--- a/tests/expected/blkid/low-probe-xfs-v5
|
|
|
dbeef3 |
+++ b/tests/expected/blkid/low-probe-xfs-v5
|
|
|
dbeef3 |
@@ -1,4 +1,5 @@
|
|
|
dbeef3 |
ID_FS_BLOCK_SIZE=512
|
|
|
dbeef3 |
+ID_FS_FSSIZE=17469440
|
|
|
dbeef3 |
ID_FS_LABEL=test-xfs-v5
|
|
|
dbeef3 |
ID_FS_LABEL_ENC=test-xfs-v5
|
|
|
dbeef3 |
ID_FS_TYPE=xfs
|
|
|
dbeef3 |
--
|
|
|
dbeef3 |
2.36.1
|
|
|
dbeef3 |
|