5a8898b817
Add 0150-libmpathpersist-retry-commands-on-other-paths-in-mpa.patch
Add 0151-libmpathpersist-check-released-key-against-the-reser.patch
Add 0152-multipathd-remove-thread-from-mpath_pr_event_handle.patch
Add 0153-libmpathpersist-remove-uneeded-wrapper-function.patch
Add 0154-libmpathpersist-reduce-log-level-for-persistent-rese.patch
Add 0155-libmpathpersist-remove-pointless-update_map_pr-ret-v.patch
Add 0156-multipathd-use-update_map_pr-in-mpath_pr_event_handl.patch
Add 0157-libmpathpersist-limit-changing-prflag-in-update_map_.patch
Add 0158-multipathd-Don-t-call-update_map_pr-unnecessarily.patch
Add 0159-libmpathpersist-remove-useless-function-send_prout_a.patch
Add 0160-libmpathpersist-fix-memory-leak-in-mpath_prout_rel.patch
Add 0161-limpathpersist-redesign-failed-release-workaround.patch
Add 0162-libmpathpersist-fail-the-release-if-all-threads-fail.patch
Add 0163-limpathpersist-Handle-changing-key-corner-case.patch
Add 0164-libmpathpersist-fix-command-keyword-ordering.patch
Add 0165-libmpathpersist-use-conf-timeout-for-updating-persis.patch
Add 0166-libmapthpersist-Handle-REGISTER-AND-IGNORE-changing-.patch
Add 0167-libmultipath-rename-prflag_value-enums.patch
Add 0168-libmpathpersist-use-a-switch-statement-for-prout-com.patch
Add 0169-libmpathpersist-Add-safety-check-for-preempting-on-k.patch
Add 0170-limpathpersist-remove-update_map_pr-code-for-NULL-pp.patch
Add 0171-libmpathpersist-move-update_map_pr-to-multipathd.patch
Add 0172-multipathd-clean-up-update_map_pr-and-mpath_pr_event.patch
Add 0173-libmpathpersist-clean-up-duplicate-function-declarat.patch
Add 0174-multipathd-wrap-setting-and-unsetting-prflag.patch
Add 0175-multipathd-unregister-PR-key-when-path-is-restored-i.patch
Add 0176-libmpathpersist-Fix-up-reservation_key-checking.patch
Add 0177-libmpathpersist-change-how-reservation-conflicts-are.patch
Add 0178-libmpathpersist-Clear-prkey-in-multipathd-before-unr.patch
Add 0179-libmpathpersist-only-clear-the-key-if-we-are-using-t.patch
Add 0180-libmpathpersist-Restore-old-reservation-key-on-failu.patch
Add 0181-libmpatpersist-update-reservation-key-before-checkin.patch
Add 0182-libmpathpersist-retry-on-conflicts-in-mpath_prout_co.patch
Add 0183-libmpathpersist-Don-t-always-fail-registrations-for-.patch
Add 0184-libmpathpersist-Don-t-try-release-workaround-for-inv.patch
Add 0185-libmpathpersist-Don-t-fail-RESERVE-commands-unnecess.patch
Add 0186-libmpathpersist-reregister-keys-when-self-preempting.patch
Add 0187-libmpathpersist-handle-updating-key-race-condition.patch
Add 0188-libmpathpersist-handle-preempting-all-registrants-re.patch
Add 0189-libmpathpersist-Fix-REGISTER-AND-IGNORE-while-holdin.patch
Add 0190-libmpathpersist-Handle-RESERVE-with-reservation-held.patch
Add 0191-libmpathpersist-use-check_holding_reservation-in-mpa.patch
Add 0192-libmpathpersist-Fix-unregistering-while-holding-the-.patch
Add 0193-libmpathpersist-Fix-race-between-restoring-a-path-an.patch
Add 0194-multipathd-Fix-tracking-of-old-PR-key.patch
* Fixes RHEL-118515 ("There are many bugs in multipath's persistent
reservation handling")
Resolves: RHEL-118515
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 16 Jun 2025 19:39:04 -0400
|
|
Subject: [PATCH] libmpathpersist: remove uneeded wrapper function.
|
|
|
|
mpath_send_prin_activepath() just calls prin_do_scsi_ioctl() with exactly
|
|
the same arguments that it is passed, and returns the same return. remove
|
|
it.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist.c | 15 ++-------------
|
|
libmpathpersist/mpathpr.h | 1 -
|
|
2 files changed, 2 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
|
|
index 9d42704d..a7d07963 100644
|
|
--- a/libmpathpersist/mpath_persist.c
|
|
+++ b/libmpathpersist/mpath_persist.c
|
|
@@ -118,8 +118,8 @@ mpath_prin_activepath (struct multipath *mpp, int rq_servact,
|
|
|
|
condlog(3, "%s: sending pr in command to %s ",
|
|
mpp->wwid, pp->dev);
|
|
- ret = mpath_send_prin_activepath(pp->dev, rq_servact,
|
|
- resp, noisy);
|
|
+ ret = prin_do_scsi_ioctl(pp->dev, rq_servact, resp,
|
|
+ noisy);
|
|
switch(ret)
|
|
{
|
|
case MPATH_PR_SUCCESS:
|
|
@@ -418,17 +418,6 @@ get_mpvec (vector curmp, vector pathvec, char * refwwid)
|
|
return MPATH_PR_SUCCESS ;
|
|
}
|
|
|
|
-int mpath_send_prin_activepath (char * dev, int rq_servact,
|
|
- struct prin_resp * resp, int noisy)
|
|
-{
|
|
-
|
|
- int rc;
|
|
-
|
|
- rc = prin_do_scsi_ioctl(dev, rq_servact, resp, noisy);
|
|
-
|
|
- return (rc);
|
|
-}
|
|
-
|
|
int mpath_prout_reg(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
unsigned int rq_type, struct prout_param_descriptor * paramp, int noisy)
|
|
{
|
|
diff --git a/libmpathpersist/mpathpr.h b/libmpathpersist/mpathpr.h
|
|
index 5ea8cd6f..0292bc50 100644
|
|
--- a/libmpathpersist/mpathpr.h
|
|
+++ b/libmpathpersist/mpathpr.h
|
|
@@ -31,7 +31,6 @@ int prin_do_scsi_ioctl(char * dev, int rq_servact, struct prin_resp * resp, int
|
|
int prout_do_scsi_ioctl( char * dev, int rq_servact, int rq_scope,
|
|
unsigned int rq_type, struct prout_param_descriptor *paramp, int noisy);
|
|
void * _mpath_pr_update (void *arg);
|
|
-int mpath_send_prin_activepath (char * dev, int rq_servact, struct prin_resp * resp, int noisy);
|
|
int get_mpvec (vector curmp, vector pathvec, char * refwwid);
|
|
void * mpath_prout_pthread_fn(void *p);
|
|
void dumpHex(const char* , int len, int no_ascii);
|