64b1cb0e21
Update Source to 0.7.7
* Previous patches 0001-0009 & 0018 are included in this commit
Add upstream patches since 0.7.7
* patches 0001-0012 are from upstream commits since 0.7.7
Add 0015-mpathpersist-add-all_tg_pt-option.patch
* add new all_tg_pt multpiath.conf option. posted upstream
Add 0016-libmultipath-remove-rbd-code.patch
* remove unused rbd code. posted upstream
Add 0017-mpathpersist-fix-aptpl-support.patch
* add ":aptpl" suffix for reservation_key to fix aptpl support.
posted upstream
Add 0018-multipath-don-t-check-timestamps-without-a-path.patch
* fix multipath null dereference crash. posted upstream
Add 0019-libmultipath-fix-detect-alua-corner-case.patch
* fix alua detection with retain_hardware_handler set to off. posted
upstream
Add 0020-multipath-fix-setting-conf-version.patch
* multipath wasn't setting the kernel version correctly. posted
upstream
Add 0028-RH-reset-default-find_mutipaths-value-to-off.patch
* default to RHEL7 and older device detection style. Redhat specific,
to keep customer experience the same.
Rename files
* Previous patches 0010-0011 are now patches 0013-0014
* Previous patches 0012-0017 & 0019 are now patches 0021-0027
Modify 0021-RH-fixup-udev-rules-for-redhat.patch
* Fix spurious compile warning with redhat compile options
157 lines
4.9 KiB
Diff
157 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Xose Vazquez Perez <xose.vazquez@gmail.com>
|
|
Date: Fri, 11 May 2018 15:43:11 +0200
|
|
Subject: [PATCH] multipath-tools: Remove trailing/leading whitespaces and
|
|
reformat code
|
|
|
|
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
|
|
Cc: device-mapper development <dm-devel@redhat.com>
|
|
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
Makefile.inc | 23 +++++++++++------------
|
|
kpartx/mac.h | 2 +-
|
|
kpartx/test-kpartx | 2 +-
|
|
libmpathcmd/Makefile | 2 +-
|
|
libmultipath/hwtable.c | 14 +++++++-------
|
|
libmultipath/print.h | 2 +-
|
|
multipathd/main.h | 6 +++---
|
|
7 files changed, 25 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
|
index 57a1835..af2f5ba 100644
|
|
--- a/Makefile.inc
|
|
+++ b/Makefile.inc
|
|
@@ -103,21 +103,20 @@ LDFLAGS = -Wl,-z,relro -Wl,-z,now
|
|
BIN_LDFLAGS = -pie
|
|
|
|
# Check whether a function with name $1 has been declared in header file $2.
|
|
-check_func = \
|
|
- $(shell \
|
|
+check_func = $(shell \
|
|
if grep -Eq "^[^[:blank:]]+[[:blank:]]+$1[[:blank:]]*(.*)*" "$2"; then \
|
|
- found=1; \
|
|
- status="yes"; \
|
|
- else \
|
|
- found=0; \
|
|
- status="no"; \
|
|
- fi; \
|
|
- echo 1>&2 "Checking for $1 in $2 ... $$status"; \
|
|
- echo "$$found" \
|
|
- )
|
|
+ found=1; \
|
|
+ status="yes"; \
|
|
+ else \
|
|
+ found=0; \
|
|
+ status="no"; \
|
|
+ fi; \
|
|
+ echo 1>&2 "Checking for $1 in $2 ... $$status"; \
|
|
+ echo "$$found" \
|
|
+ )
|
|
|
|
# Checker whether a file with name $1 exists
|
|
-check_file = $(shell \
|
|
+check_file = $(shell \
|
|
if [ -f "$1" ]; then \
|
|
found=1; \
|
|
status="yes"; \
|
|
diff --git a/kpartx/mac.h b/kpartx/mac.h
|
|
index a44cf38..55c3ec9 100644
|
|
--- a/kpartx/mac.h
|
|
+++ b/kpartx/mac.h
|
|
@@ -24,7 +24,7 @@ struct mac_driver_desc {
|
|
uint16_t signature; /* expected to be MAC_DRIVER_MAGIC */
|
|
uint16_t block_size;
|
|
uint32_t block_count;
|
|
- /* ... more stuff */
|
|
+ /* ... more stuff */
|
|
};
|
|
|
|
#endif
|
|
diff --git a/kpartx/test-kpartx b/kpartx/test-kpartx
|
|
index 9cee20f..d2001dc 100755
|
|
--- a/kpartx/test-kpartx
|
|
+++ b/kpartx/test-kpartx
|
|
@@ -131,7 +131,7 @@ step "create DM devices (spans)"
|
|
# They also serve as DM devices to test partition removal on those.
|
|
|
|
TABLE="\
|
|
-0 $((SIZE/SECTSIZ-OFFS)) linear $DEV1 $OFFS
|
|
+0 $((SIZE/SECTSIZ-OFFS)) linear $DEV1 $OFFS
|
|
$((SIZE/SECTSIZ-OFFS)) $((SIZE/SECTSIZ-OFFS)) linear $DEV2 $OFFS"
|
|
|
|
SPAN1=kpt
|
|
diff --git a/libmpathcmd/Makefile b/libmpathcmd/Makefile
|
|
index 53c0899..0f6b816 100644
|
|
--- a/libmpathcmd/Makefile
|
|
+++ b/libmpathcmd/Makefile
|
|
@@ -27,7 +27,7 @@ uninstall:
|
|
$(RM) $(DESTDIR)$(includedir)/mpath_cmd.h
|
|
|
|
clean: dep_clean
|
|
- $(RM) core *.a *.o *.so *.so.* *.gz
|
|
+ $(RM) core *.a *.o *.so *.so.* *.gz
|
|
|
|
include $(wildcard $(OBJS:.o=.d))
|
|
|
|
diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
|
|
index 827e899..2ca6888 100644
|
|
--- a/libmultipath/hwtable.c
|
|
+++ b/libmultipath/hwtable.c
|
|
@@ -78,13 +78,13 @@
|
|
#endif
|
|
|
|
static struct hwentry default_hw[] = {
|
|
- /*
|
|
- * Generic NVMe
|
|
- *
|
|
- * Due to the parsing logic in find_hwe(), generic entries
|
|
- * have to be put on top of this list, and more specific ones
|
|
- * below.
|
|
- */
|
|
+ /*
|
|
+ * Generic NVMe devices
|
|
+ *
|
|
+ * Due to the parsing logic in find_hwe(), generic entries
|
|
+ * have to be put on top of this list, and more specific ones
|
|
+ * below.
|
|
+ */
|
|
{
|
|
.vendor = "NVME",
|
|
.product = ".*",
|
|
diff --git a/libmultipath/print.h b/libmultipath/print.h
|
|
index 7ba6438..9b5a23a 100644
|
|
--- a/libmultipath/print.h
|
|
+++ b/libmultipath/print.h
|
|
@@ -113,7 +113,7 @@ int _snprint_multipath (const struct gen_multipath *, char *, int,
|
|
const char *, int);
|
|
#define snprint_multipath(buf, len, fmt, mp, v) \
|
|
_snprint_multipath(dm_multipath_to_gen(mp), buf, len, fmt, v)
|
|
-int _snprint_multipath_topology (const struct gen_multipath *, char *, int,
|
|
+int _snprint_multipath_topology (const struct gen_multipath *, char *, int,
|
|
int verbosity);
|
|
#define snprint_multipath_topology(buf, len, mpp, v) \
|
|
_snprint_multipath_topology (dm_multipath_to_gen(mpp), buf, len, v)
|
|
diff --git a/multipathd/main.h b/multipathd/main.h
|
|
index af39558..8fd426b 100644
|
|
--- a/multipathd/main.h
|
|
+++ b/multipathd/main.h
|
|
@@ -29,11 +29,11 @@ int ev_remove_map (char *, char *, int, struct vectors *);
|
|
int set_config_state(enum daemon_status);
|
|
void * mpath_alloc_prin_response(int prin_sa);
|
|
int prin_do_scsi_ioctl(char *, int rq_servact, struct prin_resp * resp,
|
|
- int noisy);
|
|
+ int noisy);
|
|
void dumpHex(const char * , int len, int no_ascii);
|
|
int prout_do_scsi_ioctl(char * , int rq_servact, int rq_scope,
|
|
- unsigned int rq_type, struct prout_param_descriptor *param,
|
|
- int noisy);
|
|
+ unsigned int rq_type,
|
|
+ struct prout_param_descriptor *param, int noisy);
|
|
int mpath_pr_event_handle(struct path *pp);
|
|
void * mpath_pr_event_handler_fn (void * );
|
|
int update_map_pr(struct multipath *mpp);
|
|
--
|
|
2.7.4
|
|
|