Karel Zak 18b0e4
From 96a699563b65b6a9204f2c3184faf1366155a614 Mon Sep 17 00:00:00 2001
Karel Zak 18b0e4
From: Andrey Albershteyn <aalbersh@redhat.com>
Karel Zak 18b0e4
Date: Wed, 27 Apr 2022 17:33:33 +0200
Karel Zak 18b0e4
Subject: blkid: add tests for FSLASTBLOCK tag
Karel Zak 18b0e4
Karel Zak 18b0e4
Upstream: http://github.com/util-linux/util-linux/commit/800ed56f4
Karel Zak 18b0e4
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2064810
Karel Zak 18b0e4
Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
Karel Zak 18b0e4
---
Karel Zak 18b0e4
 misc-utils/blkid.c                    | 2 +-
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-btrfs  | 1 +
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-ext2   | 1 +
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-ext3   | 1 +
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-jbd    | 1 +
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-xfs    | 1 +
Karel Zak 18b0e4
 tests/expected/blkid/low-probe-xfs-v5 | 1 +
Karel Zak 18b0e4
 7 files changed, 7 insertions(+), 1 deletion(-)
Karel Zak 18b0e4
Karel Zak 18b0e4
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
Karel Zak 18b0e4
index 4f456be52..f2b190ce3 100644
Karel Zak 18b0e4
--- a/misc-utils/blkid.c
Karel Zak 18b0e4
+++ b/misc-utils/blkid.c
Karel Zak 18b0e4
@@ -893,7 +893,7 @@ int main(int argc, char **argv)
Karel Zak 18b0e4
 				BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
Karel Zak 18b0e4
 				BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE |
Karel Zak 18b0e4
 				BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION |
Karel Zak 18b0e4
-				BLKID_SUBLKS_FSSIZE);
Karel Zak 18b0e4
+				BLKID_SUBLKS_FSSIZE | BLKID_SUBLKS_FSLASTBLOCK);
Karel Zak 18b0e4
 
Karel Zak 18b0e4
 
Karel Zak 18b0e4
 			if (fltr_usage &&
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-btrfs b/tests/expected/blkid/low-probe-btrfs
Karel Zak 18b0e4
index 509fac378..48649389a 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-btrfs
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-btrfs
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=4096
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=29440
Karel Zak 18b0e4
 ID_FS_TYPE=btrfs
Karel Zak 18b0e4
 ID_FS_USAGE=filesystem
Karel Zak 18b0e4
 ID_FS_UUID=d4a78b72-55e4-4811-86a6-09af936d43f9
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-ext2 b/tests/expected/blkid/low-probe-ext2
Karel Zak 18b0e4
index 087da97a4..e236c6e8a 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-ext2
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-ext2
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=1024
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=100
Karel Zak 18b0e4
 ID_FS_LABEL=test-ext2
Karel Zak 18b0e4
 ID_FS_LABEL_ENC=test-ext2
Karel Zak 18b0e4
 ID_FS_TYPE=ext2
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-ext3 b/tests/expected/blkid/low-probe-ext3
Karel Zak 18b0e4
index 8684884c1..164fefb7b 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-ext3
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-ext3
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=1024
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=2048
Karel Zak 18b0e4
 ID_FS_LABEL=test-ext3
Karel Zak 18b0e4
 ID_FS_LABEL_ENC=test-ext3
Karel Zak 18b0e4
 ID_FS_SEC_TYPE=ext2
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-jbd b/tests/expected/blkid/low-probe-jbd
Karel Zak 18b0e4
index c9f9f6b79..f5462a2a3 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-jbd
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-jbd
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=1024
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=1024
Karel Zak 18b0e4
 ID_FS_LOGUUID=0d7a07df-7b06-4829-bce7-3b9c3ece570c
Karel Zak 18b0e4
 ID_FS_TYPE=jbd
Karel Zak 18b0e4
 ID_FS_USAGE=other
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs
Karel Zak 18b0e4
index a91e92bcc..be9c4194a 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-xfs
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-xfs
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=512
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=4096
Karel Zak 18b0e4
 ID_FS_FSSIZE=11862016
Karel Zak 18b0e4
 ID_FS_LABEL=test-xfs
Karel Zak 18b0e4
 ID_FS_LABEL_ENC=test-xfs
Karel Zak 18b0e4
diff --git a/tests/expected/blkid/low-probe-xfs-v5 b/tests/expected/blkid/low-probe-xfs-v5
Karel Zak 18b0e4
index 129b41f26..fd2cba933 100644
Karel Zak 18b0e4
--- a/tests/expected/blkid/low-probe-xfs-v5
Karel Zak 18b0e4
+++ b/tests/expected/blkid/low-probe-xfs-v5
Karel Zak 18b0e4
@@ -1,4 +1,5 @@
Karel Zak 18b0e4
 ID_FS_BLOCK_SIZE=512
Karel Zak 18b0e4
+ID_FS_FSLASTBLOCK=5120
Karel Zak 18b0e4
 ID_FS_FSSIZE=17469440
Karel Zak 18b0e4
 ID_FS_LABEL=test-xfs-v5
Karel Zak 18b0e4
 ID_FS_LABEL_ENC=test-xfs-v5
Karel Zak 18b0e4
-- 
Karel Zak 18b0e4
2.36.1
Karel Zak 18b0e4