rpms/libblockdev
6
0
Fork 0
Code Issues Pull Requests Releases Activity

nvme: Avoid element-type g-i annotations

Browse Source 
Resolves: RHEL-66117
This commit is contained in:
Vojtech Trefny 2024-11-13 08:30:31 +01:00
parent 226f8b9a9f
commit 5ae2dbe329
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0001-nvme_Avoid_element-type_g-i_annotations.patch Normal file
View File

@ -0,0 +1,56 @@
From 6cce09cff6567caf992dfe37a6e78192117ac040 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 6 Nov 2024 15:15:10 +0100
Subject: [PATCH] nvme: Avoid element-type g-i annotations
For some reason this is causing more harm and seems to work fine
when absent.
---
src/lib/plugin_apis/nvme.api | 4 ++--
src/plugins/nvme/nvme.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/plugin_apis/nvme.api b/src/lib/plugin_apis/nvme.api
index 2f17e0c96..604eaf9b1 100644
--- a/src/lib/plugin_apis/nvme.api
+++ b/src/lib/plugin_apis/nvme.api
@@ -364,7 +364,7 @@ GType bd_nvme_namespace_info_get_type ();
* @features: features and capabilities present for this namespace, see #BDNVMENamespaceFeature.
* @format_progress_remaining: The percentage value remaining of a format operation in progress.
* @write_protected: %TRUE if the namespace is currently write protected and all write access to the namespace shall fail.
- * @lba_formats: (array zero-terminated=1) (element-type BDNVMELBAFormat): A list of supported LBA Formats.
+ * @lba_formats: (array zero-terminated=1): A list of supported LBA Formats.
* @current_lba_format: A LBA Format currently used for the namespace. Contains zeroes in case of
* an invalid or no supported LBA Format reported.
*/
@@ -800,7 +800,7 @@ GType bd_nvme_self_test_log_get_type ();
* BDNVMESelfTestLog:
* @current_operation: Current running device self-test operation. There's no corresponding record in @entries for a device self-test operation that is in progress.
* @current_operation_completion: Percentage of the currently running device self-test operation. Only valid when @current_operation is other than #BD_NVME_SELF_TEST_ACTION_NOT_RUNNING.
- * @entries: (array zero-terminated=1) (element-type BDNVMESelfTestLogEntry): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest.
+ * @entries: (array zero-terminated=1): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest.
*/
typedef struct BDNVMESelfTestLog {
BDNVMESelfTestAction current_operation;
diff --git a/src/plugins/nvme/nvme.h b/src/plugins/nvme/nvme.h
index ba5304167..e073a6542 100644
--- a/src/plugins/nvme/nvme.h
+++ b/src/plugins/nvme/nvme.h
@@ -234,7 +234,7 @@ typedef enum {
* @features: features and capabilities present for this namespace, see #BDNVMENamespaceFeature.
* @format_progress_remaining: The percentage value remaining of a format operation in progress.
* @write_protected: %TRUE if the namespace is currently write protected and all write access to the namespace shall fail.
- * @lba_formats: (array zero-terminated=1) (element-type BDNVMELBAFormat): A list of supported LBA Formats.
+ * @lba_formats: (array zero-terminated=1): A list of supported LBA Formats.
* @current_lba_format: A LBA Format currently used for the namespace. Contains zeroes in case of
* an invalid or no supported LBA Format reported.
*/
@@ -442,7 +442,7 @@ typedef struct BDNVMESelfTestLogEntry {
* BDNVMESelfTestLog:
* @current_operation: Current running device self-test operation. There's no corresponding record in @entries for a device self-test operation that is in progress.
* @current_operation_completion: Percentage of the currently running device self-test operation. Only valid when @current_operation is other than #BD_NVME_SELF_TEST_ACTION_NOT_RUNNING.
- * @entries: (array zero-terminated=1) (element-type BDNVMESelfTestLogEntry): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest.
+ * @entries: (array zero-terminated=1): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest.
*/
typedef struct BDNVMESelfTestLog {
BDNVMESelfTestAction current_operation;

7
libblockdev.spec
View File

@ -86,11 +86,12 @@
Name: libblockdev
Version: 3.2.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A library for low-level manipulation with block devices
License: LGPL-2.1-or-later
URL: https://github.com/storaged-project/libblockdev
Source0: https://github.com/storaged-project/libblockdev/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-nvme_Avoid_element-type_g-i_annotations.patch
BuildRequires: make
BuildRequires: glib2-devel
@ -946,6 +947,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%files plugins-all
%changelog
* Wed Nov 13 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.2.0-2
- nvme: Avoid element-type g-i annotations
Resolves: RHEL-66117
* Wed Oct 30 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.2.0-1
- Update to 3.2.0
Resolves: RHEL-60272