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);
|
|
|