rpms/libblockdev
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Fix getting bitmap location on latest kernels

Browse Source 
Resolves: RHEL-177942
This commit is contained in:
Vojtech Trefny 2026-07-09 13:39:07 +02:00
parent d5677c7bbf
commit 2779814751
2 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0019-md-Fix-getting-bitmap-location-on-latest-kernels.patch Normal file
View File

@ -0,0 +1,81 @@
From dafc114a5eca83c366efe0564914c26f65370fdd Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 5 Nov 2025 15:12:08 +0100
Subject: [PATCH] md: Fix getting bitmap location on latest kernels
The 'md/bitmap/location' file no longer exists in sysfs when the
bitmap is not set. The location of the "internal" bitmap is also
slightly differet now.
---
src/plugins/mdraid.c | 20 +++++++++++---------
tests/mdraid_test.py | 3 +--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/plugins/mdraid.c b/src/plugins/mdraid.c
index 86ca488b..d732629b 100644
--- a/src/plugins/mdraid.c
+++ b/src/plugins/mdraid.c
@@ -1482,10 +1482,11 @@ gboolean bd_md_set_bitmap_location (const gchar *raid_spec, const gchar *locatio
* Tech category: %BD_MD_TECH_MDRAID-%BD_MD_TECH_MODE_QUERY
*/
gchar* bd_md_get_bitmap_location (const gchar *raid_spec, GError **error) {
- gchar *raid_node = NULL;
- gchar *sys_path = NULL;
+ g_autofree gchar *raid_node = NULL;
+ g_autofree gchar *sys_path = NULL;
gchar *ret = NULL;
gboolean success = FALSE;
+ GError *l_error = NULL;
raid_node = get_sysfs_name_from_input (raid_spec, error);
if (!raid_node)
@@ -1493,17 +1494,18 @@ gchar* bd_md_get_bitmap_location (const gchar *raid_spec, GError **error) {
return NULL;
sys_path = g_strdup_printf ("/sys/class/block/%s/md/bitmap/location", raid_node);
- g_free (raid_node);
- success = g_file_get_contents (sys_path, &ret, NULL, error);
+ success = g_file_get_contents (sys_path, &ret, NULL, &l_error);
if (!success) {
- /* error is alraedy populated */
- g_free (sys_path);
- return NULL;
+ if (g_error_matches (l_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+ g_clear_error (&l_error);
+ return g_strdup ("none");
+ } else {
+ g_propagate_prefixed_error (error, l_error, "Failed to get bitmap location: ");
+ return NULL;
+ }
}
- g_free (sys_path);
-
return g_strstrip (ret);
}
diff --git a/tests/mdraid_test.py b/tests/mdraid_test.py
index 38f43a0d..be227339 100644
--- a/tests/mdraid_test.py
+++ b/tests/mdraid_test.py
@@ -521,7 +521,6 @@ class MDTestNameNodeBijection(MDTestCase):
self.assertTrue(succ)
class MDTestSetBitmapLocation(MDTestCase):
- @tag_test(TestTags.SLOW, TestTags.UNSTABLE)
def test_set_bitmap_location(self):
"""Verify we can change bitmap location for an existing MD array"""
@@ -541,7 +540,7 @@ class MDTestSetBitmapLocation(MDTestCase):
self.assertTrue(succ)
loc = BlockDev.md_get_bitmap_location("bd_test_md")
- self.assertEqual(loc, "+8")
+ self.assertIn(loc, ("+8", "+2"))
# test some different name specifications
# (need to switch between internal and none because setting the same
--
2.54.0

7
libblockdev.spec
View File

@ -129,7 +129,7 @@
Name: libblockdev
Version: 2.28
Release: 16%{?dist}
Release: 17%{?dist}
Summary: A library for low-level manipulation with block devices
License: LGPLv2+
URL: https://github.com/storaged-project/libblockdev
@ -153,6 +153,7 @@ Patch15: 0015-crypto-Add-a-function-to-set-persistent-flags-for-LU.patch
Patch16: 0016-Don-t-allow-suid-and-dev-set-on-fs-resize.patch
Patch17: 0017-lvm-dbus-Fix-calling-lvcreate-with-empty-list-of-PVs.patch
Patch18: 0018-Adjust-sizes-in-generic-FS-resize-test-for-VFAT-resize.patch
Patch19: 0019-md-Fix-getting-bitmap-location-on-latest-kernels.patch
BuildRequires: make
BuildRequires: glib2-devel
@ -1051,6 +1052,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%files plugins-all
%changelog
* Thu Jul 09 2026 Vojtech Trefny <vtrefny@redhat.com> - 2.28-17
- Fix getting bitmap location on latest kernels
Resolves: RHEL-177942
* Thu Oct 30 2025 Vojtech Trefny <vtrefny@redhat.com> - 2.28-16
- tests: Adjust sizes in generic FS resize test for VFAT resize
Resolves: RHEL-124142