695f9436f4
Add 0035-libmpathpersist-fix-memory-leak-in-mpath_prout_rel.patch
Add 0036-libmpathpersist-retry-commands-on-other-paths-in-mpa.patch
Add 0037-libmpathpersist-check-released-key-against-the-reser.patch
Add 0038-multipathd-remove-thread-from-mpath_pr_event_handle.patch
Add 0039-libmpathpersist-remove-uneeded-wrapper-function.patch
Add 0040-libmpathpersist-reduce-log-level-for-persistent-rese.patch
Add 0041-libmpathpersist-remove-pointless-update_map_pr-ret-v.patch
Add 0042-multipathd-use-update_map_pr-in-mpath_pr_event_handl.patch
Add 0043-libmpathpersist-limit-changing-prflag-in-update_map_.patch
Add 0044-multipathd-Don-t-call-update_map_pr-unnecessarily.patch
Add 0045-libmpathpersist-remove-useless-function-send_prout_a.patch
Add 0046-libmpathpersist-redesign-failed-release-workaround.patch
Add 0047-libmpathpersist-fail-the-release-if-all-threads-fail.patch
Add 0048-libmpathpersist-Handle-changing-key-corner-case.patch
Add 0049-libmpathpersist-Handle-REGISTER-AND-IGNORE-changing-.patch
Add 0050-libmultipath-rename-prflag_value-enums.patch
Add 0051-libmpathpersist-use-a-switch-statement-for-prout-com.patch
Add 0052-libmpathpersist-Add-safety-check-for-preempting-on-k.patch
Add 0053-libmpathpersist-remove-update_map_pr-code-for-NULL-p.patch
Add 0054-libmpathpersist-move-update_map_pr-to-multipathd.patch
Add 0055-multipathd-clean-up-update_map_pr-and-mpath_pr_event.patch
Add 0056-libmpathpersist-clean-up-duplicate-function-declarat.patch
Add 0057-multipathd-wrap-setting-and-unsetting-prflag.patch
Add 0058-multipathd-unregister-PR-key-when-path-is-restored-i.patch
Add 0059-libmpathpersist-Fix-up-reservation_key-checking.patch
Add 0060-libmpathpersist-change-how-reservation-conflicts-are.patch
Add 0061-libmpathpersist-Clear-prkey-in-multipathd-before-unr.patch
Add 0062-libmpathpersist-only-clear-the-key-if-we-are-using-t.patch
Add 0063-libmpathpersist-Restore-old-reservation-key-on-failu.patch
Add 0064-libmpathpersist-update-reservation-key-before-checki.patch
Add 0065-libmpathpersist-retry-on-conflicts-in-mpath_prout_co.patch
Add 0066-libmpathpersist-Don-t-always-fail-registrations-for-.patch
Add 0067-libmpathpersist-Don-t-try-release-workaround-for-inv.patch
Add 0068-libmpathpersist-Don-t-fail-RESERVE-commands-unnecess.patch
Add 0069-libmpathpersist-reregister-keys-when-self-preempting.patch
Add 0070-libmpathpersist-handle-updating-key-race-condition.patch
Add 0071-libmpathpersist-handle-preempting-all-registrants-re.patch
Add 0072-libmpathpersist-Fix-REGISTER-AND-IGNORE-while-holdin.patch
Add 0073-libmpathpersist-Handle-RESERVE-with-reservation-held.patch
Add 0074-libmpathpersist-use-check_holding_reservation-in-mpa.patch
Add 0075-libmpathpersist-Fix-unregistering-while-holding-the-.patch
Add 0076-libmpathpersist-Fix-race-between-restoring-a-path-an.patch
Add 0077-multipathd-Fix-tracking-of-old-PR-key.patch
* Fixes RHEL-118720 ("There are many bugs in multipath's persistent
reservation handling [rhel-10]")
Resolves: RHEL-118720
66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 25 Jul 2025 23:58:45 -0400
|
|
Subject: [PATCH] libmpathpersist: clean up duplicate function declarations
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
libmpathpersist/mpath_persist_int.h | 1 -
|
|
libmpathpersist/mpath_pr_ioctl.c | 10 +++-------
|
|
mpathpersist/main.c | 2 --
|
|
3 files changed, 3 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist_int.h b/libmpathpersist/mpath_persist_int.h
|
|
index d9fc7448..aefc17e4 100644
|
|
--- a/libmpathpersist/mpath_persist_int.h
|
|
+++ b/libmpathpersist/mpath_persist_int.h
|
|
@@ -6,7 +6,6 @@
|
|
* but aren't part of the public libmpathpersist API.
|
|
*/
|
|
|
|
-void * mpath_alloc_prin_response(int prin_sa);
|
|
int do_mpath_persistent_reserve_in(vector curmp, vector pathvec,
|
|
int fd, int rq_servact,
|
|
struct prin_resp *resp, int noisy);
|
|
diff --git a/libmpathpersist/mpath_pr_ioctl.c b/libmpathpersist/mpath_pr_ioctl.c
|
|
index 7e1d2896..dfdbbb65 100644
|
|
--- a/libmpathpersist/mpath_pr_ioctl.c
|
|
+++ b/libmpathpersist/mpath_pr_ioctl.c
|
|
@@ -14,19 +14,15 @@
|
|
#include "mpath_pr_ioctl.h"
|
|
#include "mpath_persist.h"
|
|
#include "unaligned.h"
|
|
-
|
|
#include "debug.h"
|
|
#include "structs.h" /* FILE_NAME_SIZE */
|
|
+#include "mpath_persist_int.h"
|
|
|
|
#define TIMEOUT 2000
|
|
#define MAXRETRY 5
|
|
|
|
-int prin_do_scsi_ioctl(char * dev, int rq_servact, struct prin_resp *resp, int noisy);
|
|
-int mpath_translate_response (char * dev, struct sg_io_hdr io_hdr,
|
|
- SenseData_t *Sensedata);
|
|
-void dumpHex(const char* str, int len, int no_ascii);
|
|
-int prout_do_scsi_ioctl( char * dev, int rq_servact, int rq_scope,
|
|
- unsigned int rq_type, struct prout_param_descriptor *paramp, int noisy);
|
|
+int mpath_translate_response(char *dev, struct sg_io_hdr io_hdr,
|
|
+ SenseData_t *Sensedata);
|
|
uint32_t format_transportids(struct prout_param_descriptor *paramp);
|
|
void convert_be32_to_cpu(uint32_t *num);
|
|
void convert_be16_to_cpu(uint16_t *num);
|
|
diff --git a/mpathpersist/main.c b/mpathpersist/main.c
|
|
index b6617902..2cacafb7 100644
|
|
--- a/mpathpersist/main.c
|
|
+++ b/mpathpersist/main.c
|
|
@@ -38,8 +38,6 @@ void mpath_print_buf_readcap(struct prin_resp *pr_buff);
|
|
void mpath_print_buf_readfullstat(struct prin_resp *pr_buff);
|
|
void mpath_print_buf_readresv(struct prin_resp *pr_buff);
|
|
void mpath_print_buf_readkeys(struct prin_resp *pr_buff);
|
|
-void dumpHex(const char* str, int len, int no_ascii);
|
|
-void * mpath_alloc_prin_response(int prin_sa);
|
|
void mpath_print_transport_id(struct prin_fulldescr *fdesc);
|
|
int construct_transportid(const char * inp, struct transportid transid[], int num_transportids);
|
|
|