6738b34a0b
- Modify 0005-RH-add-mpathconf.patch
* changed warning message
- Modify 0102-RHBZ-1160478-mpathconf-template.patch
* updated man page
- Modify 0104-RHBZ-631009-deferred-remove.patch
* refactor code and minor fix
- Refresh 0107-RHBZ-1169935-no-new-devs.patch
- Refresh 0112-RHBZ-1194917-add-config_dir-option.patch
- Refresh 0126-RHBZ-1211383-alias-collision.patch
- Add 0133-RHBZ-1296979-fix-define.patch
* look for the correct libudev function to set define
- Add 0134-RHBZ-1241528-check-mpath-prefix.patch
* only touch devices with a "mpath-" dm uuid prefix
- Add 0135-RHBZ-1299600-path-dev-uevents.patch
* trigger path uevent the first time a path is claimed by multipath
- Add 0136-RHBZ-1304687-wait-for-map-add.patch
* wait for the device to finish being added before reloading it.
- Add 0137-RHBZ-1280524-clear-chkr-msg.patch
- Add 0138-RHBZ-1288660-fix-mpathconf-allow.patch
* don't remove existing lines from blacklist_exceptions section
- Add 0139-RHBZ-1273173-queue-no-daemon-doc.patch
- Add 0140-RHBZ-1299647-fix-help.patch
- Add 0141-RHBZ-1303953-mpathpersist-typo.patch
- Add 0142-RHBZ-1283750-kpartx-fix.patch
* only remove devices if their uuid says that they are the correct
partition device
- Add 0143-RHBZ-1299648-kpartx-sync.patch
* default to using udev sync mode
- Add 0144-RHBZ-1299652-alua-pref-arg.patch
* allow "exclusive_pref_bit" argument to alua prioritizer
- Add 0145-UP-resize-help-msg.patch
- Add 0146-UPBZ-1299651-raw-output.patch
* allow raw format mutipathd show commands, that remove headers and padding
- Add 0147-RHBZ-1272620-fail-rm-msg.patch
- Add 0148-RHBZ-1292599-verify-before-remove.patch
* verify that all partitions are unused before attempting to remove a device
- Add 0149-RHBZ-1292599-restore-removed-parts.patch
* don't disable kpartx when restoring the first path of a device.
- Add 0150-RHBZ-1253913-fix-startup-msg.patch
* wait for multipathd daemon to write pidfile before returning
- Add 0151-RHBZ-1297456-weighted-fix.patch
* add wwn keyword to weighted prioritizer for persistent naming
- Add 0152-RHBZ-1269293-fix-blk-unit-file.patch
* use "Wants" instead of "Requires"
- Add 0153-RH-fix-i686-size-bug.patch
* use 64-bit keycodes for multipathd client commands
- Add 0154-UPBZ-1291406-disable-reinstate.patch
* don't automatically reinstate ghost paths for implicit alua devices
- Add 0155-UPBZ-1300415-PURE-config.patch
* Add default config for PURE FlashArray
- Add 0156-UPBZ-1313324-dont-fail-discovery.patch
* don't fail discovery because individual paths failed.
- Add 0157-RHBZ-1319853-multipath-c-error-msg.patch
* better error reporting for multipath -c
- Add 0158-RHBZ-1318581-timestamp-doc-fix.patch
* add documentation for -T
- Add 0159-UPBZ-1255885-udev-waits.patch
* make multipath and kpartx wait after for udev after each command
157 lines
4.1 KiB
Diff
157 lines
4.1 KiB
Diff
---
|
|
multipathd/cli.c | 22 +++++++++++-----------
|
|
multipathd/cli.h | 20 +++++++++++---------
|
|
2 files changed, 22 insertions(+), 20 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipathd/cli.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/cli.c
|
|
+++ multipath-tools-130222/multipathd/cli.c
|
|
@@ -26,7 +26,7 @@ alloc_handler (void)
|
|
}
|
|
|
|
static int
|
|
-add_key (vector vec, char * str, unsigned long code, int has_param)
|
|
+add_key (vector vec, char * str, uint64_t code, int has_param)
|
|
{
|
|
struct key * kw;
|
|
|
|
@@ -57,7 +57,7 @@ out:
|
|
}
|
|
|
|
int
|
|
-add_handler (unsigned long fp, int (*fn)(void *, char **, int *, void *))
|
|
+add_handler (uint64_t fp, int (*fn)(void *, char **, int *, void *))
|
|
{
|
|
struct handler * h;
|
|
|
|
@@ -79,7 +79,7 @@ add_handler (unsigned long fp, int (*fn)
|
|
}
|
|
|
|
static struct handler *
|
|
-find_handler (unsigned long fp)
|
|
+find_handler (uint64_t fp)
|
|
{
|
|
int i;
|
|
struct handler *h;
|
|
@@ -92,7 +92,7 @@ find_handler (unsigned long fp)
|
|
}
|
|
|
|
int
|
|
-set_handler_callback (unsigned long fp, int (*fn)(void *, char **, int *, void *))
|
|
+set_handler_callback (uint64_t fp, int (*fn)(void *, char **, int *, void *))
|
|
{
|
|
struct handler * h = find_handler(fp);
|
|
|
|
@@ -293,11 +293,11 @@ out:
|
|
return r;
|
|
}
|
|
|
|
-static unsigned long
|
|
+static uint64_t
|
|
fingerprint(vector vec)
|
|
{
|
|
int i;
|
|
- unsigned long fp = 0;
|
|
+ uint64_t fp = 0;
|
|
struct key * kw;
|
|
|
|
if (!vec)
|
|
@@ -343,7 +343,7 @@ static int
|
|
do_genhelp(char *reply, int maxlen) {
|
|
int len = 0;
|
|
int i, j;
|
|
- unsigned long fp;
|
|
+ uint64_t fp;
|
|
struct handler * h;
|
|
struct key * kw;
|
|
|
|
@@ -442,7 +442,7 @@ parse_cmd (char * cmd, char ** reply, in
|
|
}
|
|
|
|
char *
|
|
-get_keyparam (vector v, unsigned long code)
|
|
+get_keyparam (vector v, uint64_t code)
|
|
{
|
|
struct key * kw;
|
|
int i;
|
|
@@ -515,7 +515,7 @@ void cli_exit(void)
|
|
}
|
|
|
|
static int
|
|
-key_match_fingerprint (struct key * kw, unsigned long fp)
|
|
+key_match_fingerprint (struct key * kw, uint64_t fp)
|
|
{
|
|
if (!fp)
|
|
return 0;
|
|
@@ -530,7 +530,7 @@ char *
|
|
key_generator (const char * str, int state)
|
|
{
|
|
static int index, len, has_param;
|
|
- static unsigned long rlfp;
|
|
+ static uint64_t rlfp;
|
|
struct key * kw;
|
|
int i;
|
|
struct handler *h;
|
|
@@ -600,7 +600,7 @@ key_generator (const char * str, int sta
|
|
* nfp is the candidate fingerprint we try to
|
|
* validate against all known command fingerprints.
|
|
*/
|
|
- unsigned long nfp = rlfp | kw->code;
|
|
+ uint64_t nfp = rlfp | kw->code;
|
|
vector_foreach_slot(handlers, h, i) {
|
|
if (!rlfp || ((h->fingerprint & nfp) == nfp)) {
|
|
/*
|
|
Index: multipath-tools-130222/multipathd/cli.h
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/cli.h
|
|
+++ multipath-tools-130222/multipathd/cli.h
|
|
@@ -1,3 +1,5 @@
|
|
+#include <stdint.h>
|
|
+
|
|
enum {
|
|
__LIST,
|
|
__ADD,
|
|
@@ -68,10 +70,10 @@ enum {
|
|
#define WILDCARDS (1 << __WILDCARDS)
|
|
#define QUIT (1 << __QUIT)
|
|
#define SHUTDOWN (1 << __SHUTDOWN)
|
|
-#define GETPRSTATUS (1UL << __GETPRSTATUS)
|
|
-#define SETPRSTATUS (1UL << __SETPRSTATUS)
|
|
-#define UNSETPRSTATUS (1UL << __UNSETPRSTATUS)
|
|
-#define FMT (1UL << __FMT)
|
|
+#define GETPRSTATUS (1ULL << __GETPRSTATUS)
|
|
+#define SETPRSTATUS (1ULL << __SETPRSTATUS)
|
|
+#define UNSETPRSTATUS (1ULL << __UNSETPRSTATUS)
|
|
+#define FMT (1ULL << __FMT)
|
|
|
|
#define INITIAL_REPLY_LEN 1200
|
|
|
|
@@ -92,21 +94,21 @@ enum {
|
|
struct key {
|
|
char * str;
|
|
char * param;
|
|
- unsigned long code;
|
|
+ uint64_t code;
|
|
int has_param;
|
|
};
|
|
|
|
struct handler {
|
|
- unsigned long fingerprint;
|
|
+ uint64_t fingerprint;
|
|
int (*fn)(void *, char **, int *, void *);
|
|
};
|
|
|
|
int alloc_handlers (void);
|
|
-int add_handler (unsigned long fp, int (*fn)(void *, char **, int *, void *));
|
|
-int set_handler_callback (unsigned long fp, int (*fn)(void *, char **, int *, void *));
|
|
+int add_handler (uint64_t fp, int (*fn)(void *, char **, int *, void *));
|
|
+int set_handler_callback (uint64_t fp, int (*fn)(void *, char **, int *, void *));
|
|
int parse_cmd (char * cmd, char ** reply, int * len, void *);
|
|
int load_keys (void);
|
|
-char * get_keyparam (vector v, unsigned long code);
|
|
+char * get_keyparam (vector v, uint64_t code);
|
|
void free_keys (vector vec);
|
|
void free_handlers (void);
|
|
int cli_init (void);
|