b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
50 lines
1.3 KiB
Diff
50 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 16 Sep 2020 16:08:43 +0200
|
|
Subject: [PATCH] mpathpersist: remove logsink and udev
|
|
|
|
We can use libmultipath's internal symbols now. The libmultipath
|
|
initialization is taken care of by libmpathpersist_init().
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
mpathpersist/main.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/mpathpersist/main.c b/mpathpersist/main.c
|
|
index 278e48f7..3c2e6576 100644
|
|
--- a/mpathpersist/main.c
|
|
+++ b/mpathpersist/main.c
|
|
@@ -42,13 +42,10 @@ 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);
|
|
|
|
-int logsink;
|
|
-
|
|
void rcu_register_thread_memb(void) {}
|
|
|
|
void rcu_unregister_thread_memb(void) {}
|
|
|
|
-struct udev *udev;
|
|
|
|
static int verbose, loglevel, noisy;
|
|
|
|
@@ -641,16 +638,13 @@ int main(int argc, char *argv[])
|
|
exit (1);
|
|
}
|
|
|
|
- udev = udev_new();
|
|
if (libmpathpersist_init()) {
|
|
- udev_unref(udev);
|
|
exit(1);
|
|
}
|
|
|
|
ret = handle_args(argc, argv, 0);
|
|
|
|
libmpathpersist_exit();
|
|
- udev_unref(udev);
|
|
|
|
return (ret >= 0) ? ret : MPATH_PR_OTHER;
|
|
}
|