[PATCH 01/11] multipath-tools: add support for all IBM Enterprise Storage Server / Shark family

[PATCH 01/11] multipath-tools: add support for all IBM Enterprise Storage Server / Shark family

[Xose Vazquez Perez]

Only F20 and 800 were included:
2105F20 IBM Enterprise Storage Server Model F20
2105800 IBM TotalStorage Enterprise Storage Server Model 800

Added all of them with just "^2105"
2105E10 IBM Enterprise Storage Server Model E10
2105E20 IBM Enterprise Storage Server Model E20
2105F10 IBM Enterprise Storage Server Model F10
2105750 IBM TotalStorage Enterprise Storage Server Model 750

Cc: Hannes Reinecke <hare@suse.de>
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>
---
 libmultipath/hwtable.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index edfd8fe..cd052e4 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -444,17 +444,9 @@ static struct hwentry default_hw[] = {
 		.pgfailback    = FAILBACK_UNDEF,
 	},
 	{
-		/* Enterprise Storage Server / Shark 800 */
+		/* Enterprise Storage Server / Shark family */
 		.vendor        = "IBM",
-		.product       = "^2105800",
-		.features      = "1 queue_if_no_path",
-		.pgpolicy      = GROUP_BY_SERIAL,
-		.pgfailback    = FAILBACK_UNDEF,
-	},
-	{
-		/* Enterprise Storage Server / Shark F20 */
-		.vendor        = "IBM",
-		.product       = "^2105F20",
+		.product       = "^2105",
 		.features      = "1 queue_if_no_path",
 		.pgpolicy      = GROUP_BY_SERIAL,
 		.pgfailback    = FAILBACK_UNDEF,
-- 
2.7.4

[PATCH 02/11] multipath-tools: minor edit of multipath/multipath.conf.5

[Xose Vazquez Perez]

Split long lines, and change a text from place.

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>
---
 multipath/multipath.conf.5 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 3b66ddb..fd4b1f2 100644
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -147,10 +147,11 @@ Default value is: \fBno\fR
 .
 .TP
 .B multipath_dir
-Directory where the dynamic shared objects are stored. Defined at compile time.
+Directory where the dynamic shared objects are stored.
 .RS
 .TP
-Default value is: \fB<system dependent>\fR, commonly \fI/lib64/multipath/\fR
+Default value is: \fB<system dependent>\fR. Defined at compile time, commonly
+\fI/lib64/multipath/\fR.
 .RE
 .
 .
@@ -303,8 +304,9 @@ regex can be of SCSI H:B:T:L format. For example: 1:0:.:. , *:0:0:.
 regex can be of device name format. For example: sda , sd.e
 .TP
 .I serial
-regex can be of serial number format. For example: .*J1FR.*324 . The serial can be looked
-up through sysfs or by running multipathd show paths format "%z". For example: 0395J1FR904324
+regex can be of serial number format. For example: .*J1FR.*324 . The serial can
+be looked up through sysfs or by running multipathd show paths format "%z". For
+example: 0395J1FR904324
 .TP
 .I wwn
 regex can be of the form \fI"host_wwnn:host_wwpn:target_wwnn:target_wwpn"\fR
@@ -336,8 +338,8 @@ Possible values for the feature list are:
 .RS
 .TP 12
 .I queue_if_no_path
-(Superseded by \fIno_path_retry\fR) Queue IO if no path is active. Identical to the \fIno_path_retry\fR with
-\fIqueue\fR value. See KNOWN ISSUES.
+(Superseded by \fIno_path_retry\fR) Queue IO if no path is active. Identical to
+the \fIno_path_retry\fR with \fIqueue\fR value. See KNOWN ISSUES.
 .TP
 .I no_partitions
 Disable automatic partitions generation via kpartx.
@@ -580,7 +582,8 @@ Default value is: \fB600\fR
 .
 .TP
 .B bindings_file
-The full pathname of the binding file to be used when the user_friendly_names option is set.
+The full pathname of the binding file to be used when the user_friendly_names
+option is set.
 .RS
 .TP
 Default value is: \fB/etc/multipath/bindings\fR
-- 
2.7.4

[PATCH 03/11] multipath-tools: Makefiles housekeeping

[Xose Vazquez Perez]

Apart of this relevant change in libmpathpersist/Makefile
-       $(CC) -Wall -fPIC -c $(CFLAGS) *.c
+       $(CC) -c $(CFLAGS) *.c

Mainly indent and order code.

Compiled tested, also installed and uninstalled.

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>
---
 Makefile                           | 32 ++++++++++++-------------
 Makefile.inc                       | 48 +++++++++++++++++++-------------------
 kpartx/Makefile                    |  5 ++--
 libmpathcmd/Makefile               |  6 ++---
 libmpathpersist/Makefile           | 18 +++++---------
 libmultipath/Makefile              | 29 +++++++++++------------
 libmultipath/checkers/Makefile     |  5 ++--
 libmultipath/prioritizers/Makefile |  5 ++--
 mpathpersist/Makefile              | 13 +++++------
 multipath/Makefile                 |  8 +++----
 multipathd/Makefile                | 32 ++++++++-----------------
 11 files changed, 89 insertions(+), 112 deletions(-)

diff --git a/Makefile b/Makefile
index cf1acd9..7786c83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# Makefile
 #
 # Copyright (C) 2003 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
@@ -6,16 +5,17 @@
 #
 # Try to supply the linux kernel headers.
 #
-ifeq    ($(KRNLSRC),)
-KRNLLIB = /lib/modules/$(shell uname -r)
-ifeq    ($(shell test -r $(KRNLLIB)/source && echo 1),1)
-KRNLSRC = $(KRNLLIB)/source
-KRNLOBJ = $(KRNLLIB)/build
-else
-KRNLSRC = $(KRNLLIB)/build
-KRNLOBJ = $(KRNLLIB)/build
-endif
+ifeq ($(KRNLSRC),)
+	KRNLLIB = /lib/modules/$(shell uname -r)
+	ifeq ($(shell test -r $(KRNLLIB)/source && echo 1),1)
+		KRNLSRC = $(KRNLLIB)/source
+		KRNLOBJ = $(KRNLLIB)/build
+	else
+		KRNLSRC = $(KRNLLIB)/build
+		KRNLOBJ = $(KRNLLIB)/build
+	endif
 endif
+
 export KRNLSRC
 export KRNLOBJ
 
@@ -30,10 +30,10 @@ BUILDDIRS = \
 	mpathpersist \
 	kpartx
 
-ifeq   ($(MULTIPATH_VERSION),)
-VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
+ifeq ($(MULTIPATH_VERSION),)
+	VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
 else
-VERSION = $(MULTIPATH_VERSION)
+	VERSION = $(MULTIPATH_VERSION)
 endif
 
 all: recurse
@@ -59,11 +59,11 @@ recurse_uninstall:
 	$(MAKE) -C $$dir uninstall || exit $?; \
 	done
 
-clean:	recurse_clean
+clean: recurse_clean
 
-install:	recurse_install
+install: recurse_install
 
-uninstall:	recurse_uninstall
+uninstall: recurse_uninstall
 
 .PHONY:	TAGS
 TAGS:
diff --git a/Makefile.inc b/Makefile.inc
index 3e8635f..0808e64 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,6 +1,6 @@
-# Makefile.inc
 #
 # Copyright (C) 2004 Christophe Varoqui, <christophe.varoqui@opensvc.com>
+#
 
 #
 # Allow to force some libraries to be used statically. (Uncomment one of the
@@ -39,32 +39,32 @@ ifndef SYSTEMDPATH
 	SYSTEMDPATH=usr/lib
 endif
 
-prefix      =
-exec_prefix = $(prefix)
-bindir      = $(exec_prefix)/sbin
-libudevdir  = $(prefix)/$(SYSTEMDPATH)/udev
-udevrulesdir = $(libudevdir)/rules.d
-multipathdir = $(TOPDIR)/libmultipath
-mandir      = $(prefix)/usr/share/man/man8
-man5dir     = $(prefix)/usr/share/man/man5
-man3dir      = $(prefix)/usr/share/man/man3
-syslibdir   = $(prefix)/$(LIB)
-incdir      = $(prefix)/usr/include
-libdir	    = $(prefix)/$(LIB)/multipath
-unitdir     = $(prefix)/$(SYSTEMDPATH)/systemd/system
-mpathpersistdir = $(TOPDIR)/libmpathpersist
-mpathcmddir = $(TOPDIR)/libmpathcmd
+prefix		=
+exec_prefix	= $(prefix)
+bindir		= $(exec_prefix)/sbin
+libudevdir	= $(prefix)/$(SYSTEMDPATH)/udev
+udevrulesdir	= $(libudevdir)/rules.d
+multipathdir	= $(TOPDIR)/libmultipath
+mandir		= $(prefix)/usr/share/man/man8
+man5dir		= $(prefix)/usr/share/man/man5
+man3dir		= $(prefix)/usr/share/man/man3
+syslibdir	= $(prefix)/$(LIB)
+incdir		= $(prefix)/usr/include
+libdir		= $(prefix)/$(LIB)/multipath
+unitdir		= $(prefix)/$(SYSTEMDPATH)/systemd/system
+mpathpersistdir	= $(TOPDIR)/libmpathpersist
+mpathcmddir	= $(TOPDIR)/libmpathcmd
 
-GZIP        = gzip -9 -c
-RM          = rm -f
-LN          = ln -sf
-INSTALL_PROGRAM = install
+GZIP		= gzip -9 -c
+RM		= rm -f
+LN		= ln -sf
+INSTALL_PROGRAM	= install
 
-OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
-		-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
+OPTFLAGS	= -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
+		  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
 
-CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
-SHARED_FLAGS = -shared
+CFLAGS		= $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
+SHARED_FLAGS	= -shared
 
 %.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/kpartx/Makefile b/kpartx/Makefile
index 70f836e..75b7606 100644
--- a/kpartx/Makefile
+++ b/kpartx/Makefile
@@ -1,4 +1,3 @@
-# Makefile
 #
 # Copyright (C) 2003 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
@@ -6,15 +5,17 @@ include ../Makefile.inc
 
 CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
+LDFLAGS = -ldevmapper
+
 LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h)
 
 ifneq ($(strip $(LIBDM_API_COOKIE)),0)
 	CFLAGS += -DLIBDM_API_COOKIE
 endif
 
-LDFLAGS = -ldevmapper
 OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
 	gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
+
 EXEC = kpartx
 
 all: $(EXEC)
diff --git a/libmpathcmd/Makefile b/libmpathcmd/Makefile
index 44c221d..457c4ca 100644
--- a/libmpathcmd/Makefile
+++ b/libmpathcmd/Makefile
@@ -1,8 +1,6 @@
-# Makefile
-#
 include ../Makefile.inc
 
-SONAME=0
+SONAME = 0
 DEVLIB = libmpathcmd.so
 LIBS = $(DEVLIB).$(SONAME)
 
@@ -27,4 +25,4 @@ uninstall:
 	$(RM) $(DESTDIR)$(incdir)/mpath_cmd.h
 
 clean:
-	$(RM) core *.a *.o *.gz *.so *.so.*
+	$(RM) core *.a *.o *.so *.so.* *.gz
diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
index 07fcf70..1c4b2e1 100644
--- a/libmpathpersist/Makefile
+++ b/libmpathpersist/Makefile
@@ -1,23 +1,20 @@
-# Makefile
-#
 include ../Makefile.inc
 
-SONAME=0
+SONAME = 0
 DEVLIB = libmpathpersist.so
 LIBS = $(DEVLIB).$(SONAME)
 
-
 CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) -I$(mpathcmddir)
-LIBDEPS +=  -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \
-	-L$(mpathcmddir) -lmpathcmd
+
+LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \
+	   -L$(mpathcmddir) -lmpathcmd
 
 OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
 
 all: $(LIBS)
 
-
 $(LIBS):
-	$(CC) -Wall -fPIC -c $(CFLAGS) *.c
+	$(CC) -c $(CFLAGS) *.c
 	$(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
 	$(LN) $(LIBS) $(DEVLIB)
 	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
@@ -42,7 +39,4 @@ uninstall:
 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 
 clean:
-	$(RM) core *.a *.o
-	$(RM) libmpathpersist.so.0
-	$(RM) libmpathpersist.so
-	$(RM) mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
+	$(RM) core *.a *.o *.so *.so.* *.gz
diff --git a/libmultipath/Makefile b/libmultipath/Makefile
index e44397b..3a20f8e 100644
--- a/libmultipath/Makefile
+++ b/libmultipath/Makefile
@@ -1,15 +1,18 @@
-# Makefile
 #
 # Copyright (C) 2003 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
 include ../Makefile.inc
 
-SONAME=0
+SONAME = 0
 DEVLIB = libmultipath.so
 LIBS = $(DEVLIB).$(SONAME)
+
 CFLAGS += -I$(mpathcmddir)
+
 LIBDEPS = -lpthread -ldl -ldevmapper -ludev -L$(mpathcmddir) -lmpathcmd
+
 ifdef SYSTEMD
+	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
 	ifeq ($(shell test $(SYSTEMD) -gt 209 && echo 1), 1)
 		LIBDEPS += -lsystemd
 	else
@@ -17,14 +20,6 @@ ifdef SYSTEMD
 	endif
 endif
 
-OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-	hwtable.o blacklist.o util.o dmparser.o config.o \
-	structs.o discovery.o propsel.o dict.o \
-	pgpolicies.o debug.o defaults.o uevent.o \
-	switchgroup.o uxsock.o print.o alias.o log_pthread.o \
-	log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \
-	lock.o waiter.o file.o wwids.o prioritizers/alua_rtpg.o
-
 LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h)
 
 ifneq ($(strip $(LIBDM_API_FLUSH)),0)
@@ -43,16 +38,20 @@ ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0)
 	CFLAGS += -DLIBUDEV_API_RECVBUF
 endif
 
-ifdef SYSTEMD
-	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
-endif
-
 LIBDM_API_DEFERRED = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_deferred_remove' /usr/include/libdevmapper.h)
 
 ifneq ($(strip $(LIBDM_API_DEFERRED)),0)
 	CFLAGS += -DLIBDM_API_DEFERRED
 endif
 
+OBJS = memory.o parser.o vector.o devmapper.o callout.o \
+	hwtable.o blacklist.o util.o dmparser.o config.o \
+	structs.o discovery.o propsel.o dict.o \
+	pgpolicies.o debug.o defaults.o uevent.o \
+	switchgroup.o uxsock.o print.o alias.o log_pthread.o \
+	log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \
+	lock.o waiter.o file.o wwids.o prioritizers/alua_rtpg.o
+
 all: $(LIBS)
 
 $(LIBS): $(OBJS)
@@ -70,4 +69,4 @@ uninstall:
 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
 
 clean:
-	$(RM) core *.a *.o *.gz *.so *.so.*
+	$(RM) core *.a *.o *.so *.so.* *.gz
diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
index 5fd2099..e46192c 100644
--- a/libmultipath/checkers/Makefile
+++ b/libmultipath/checkers/Makefile
@@ -1,9 +1,10 @@
-# Makefile
 #
 # Copyright (C) 2003 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
 include ../../Makefile.inc
 
+CFLAGS += -I..
+
 LIBS= \
 	libcheckcciss_tur.so \
 	libcheckreadsector0.so \
@@ -14,8 +15,6 @@ LIBS= \
 	libcheckrdac.so \
 	libcheckrbd.so
 
-CFLAGS += -I..
-
 all: $(LIBS)
 
 libcheckrbd.so: rbd.o
diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
index bb76700..eff5fc1 100644
--- a/libmultipath/prioritizers/Makefile
+++ b/libmultipath/prioritizers/Makefile
@@ -1,9 +1,10 @@
-# Makefile
 #
 # Copyright (C) 2007 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
 include ../../Makefile.inc
 
+CFLAGS += -I..
+
 LIBS = \
 	libprioalua.so \
 	libprioconst.so \
@@ -18,8 +19,6 @@ LIBS = \
 	libprioweightedpath.so \
 	libpriosysfs.so
 
-CFLAGS += -I..
-
 all: $(LIBS)
 
 libprioalua.so: alua.o alua_rtpg.o
diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile
index a458c4d..d545514 100644
--- a/mpathpersist/Makefile
+++ b/mpathpersist/Makefile
@@ -1,14 +1,14 @@
-# Makefile
-#
 include ../Makefile.inc
 
-OBJS = main.o
-
 CFLAGS += -I$(multipathdir) -I$(mpathpersistdir)
-LDFLAGS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist -L$(multipathdir) -L$(mpathcmddir) -lmpathcmd -lmultipath -ludev
+
+LDFLAGS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist \
+	   -L$(multipathdir) -L$(mpathcmddir) -lmpathcmd -lmultipath -ludev
 
 EXEC = mpathpersist
 
+OBJS = main.o
+
 all: $(EXEC)
 
 $(EXEC): $(OBJS)
@@ -22,8 +22,7 @@ install:
 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
 
 clean:
-	$(RM) *.o $(EXEC)
-	$(RM) mpathpersist.8.gz
+	$(RM) core *.o $(EXEC) *.gz
 
 uninstall:
 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
diff --git a/multipath/Makefile b/multipath/Makefile
index 9c57d3b..b125ae3 100644
--- a/multipath/Makefile
+++ b/multipath/Makefile
@@ -1,17 +1,17 @@
-# Makefile
 #
 # Copyright (C) 2003 Christophe Varoqui, <christophe.varoqui@opensvc.com>
 #
 include ../Makefile.inc
 
-OBJS = main.o
-
 CFLAGS += -I$(multipathdir) -I$(mpathcmddir)
+
 LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev \
-	-L$(mpathcmddir) -lmpathcmd
+	   -L$(mpathcmddir) -lmpathcmd
 
 EXEC = multipath
 
+OBJS = main.o
+
 all: $(EXEC)
 
 $(EXEC): $(OBJS)
diff --git a/multipathd/Makefile b/multipathd/Makefile
index 092b74b..03d7815 100644
--- a/multipathd/Makefile
+++ b/multipathd/Makefile
@@ -1,42 +1,30 @@
-EXEC = multipathd
-
 include ../Makefile.inc
 
 #
-# basic flags setting
+# debuging stuff
 #
+#CFLAGS += -DLCKDBG
+#CFLAGS += -D_DEBUG_
+#CFLAGS += -DLOGDBG
 CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) -I$(mpathcmddir)
+
+LDFLAGS += -ludev -ldl -L$(multipathdir) -lmultipath -L$(mpathpersistdir) \
+	   -lmpathpersist -L$(mpathcmddir) -lmpathcmd -lurcu -lpthread \
+	   -ldevmapper -lreadline
+
 ifdef SYSTEMD
 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
-endif
-LDFLAGS += -lurcu -lpthread -ldevmapper -lreadline
-ifdef SYSTEMD
 	ifeq ($(shell test $(SYSTEMD) -gt 209 && echo 1), 1)
 		LDFLAGS += -lsystemd
 	else
 		LDFLAGS += -lsystemd-daemon
 	endif
 endif
-LDFLAGS += -ludev -ldl \
-	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \
-	-L$(mpathcmddir) -lmpathcmd
-
-#
-# debuging stuff
-#
-#CFLAGS += -DLCKDBG
-#CFLAGS += -D_DEBUG_
-#CFLAGS += -DLOGDBG
 
-#
-# object files
-#
 OBJS = main.o pidfile.o uxlsnr.o uxclnt.o cli.o cli_handlers.o
 
+EXEC = multipathd
 
-#
-# directives
-#
 all : $(EXEC)
 
 $(EXEC): $(OBJS)
-- 
2.7.4

[PATCH 04/11] multipath-tools: Edward Goggin no longer works at EMC

[Xose Vazquez Perez]

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>
---
 libmultipath/hwtable.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index cd052e4..7d1f85e 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -161,9 +161,6 @@ static struct hwentry default_hw[] = {
 	},
 	/*
 	 * EMC
-	 *
-	 * Maintainer : Edward Goggin
-	 * Mail : egoggin@emc.com
 	 */
 	{
 		/* Symmetrix / DMX / VMAX */
-- 
2.7.4

[PATCH 05/11] multipath-tools: delete IBM/1745 ghost array

[Xose Vazquez Perez]

There is no references nowhere.
Confirmed by the original manufacturer(NetApp), and Google shows no results.

Cc: Sean Stewart <Sean.Stewart@netapp.com>
Cc: Hannes Reinecke <hare@suse.de>
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>
---
 libmultipath/hwtable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 7d1f85e..063535c 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -358,7 +358,7 @@ static struct hwentry default_hw[] = {
 	{
 		/* DS3500 / DS3512 / DS3524 */
 		.vendor        = "IBM",
-		.product       = "^(1745|1746)",
+		.product       = "^1746",
 		.bl_product    = "Universal Xport",
 		.pgpolicy      = GROUP_BY_PRIO,
 		.checker_name  = RDAC,
-- 
2.7.4

[PATCH 06/11] multipath-tools: request to update man pages if the code is changed

[Xose Vazquez Perez]

Please, document the changes.

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>
---
 libmultipath/checkers/Makefile     | 1 +
 libmultipath/defaults.h            | 4 ++++
 libmultipath/dict.c                | 3 +++
 libmultipath/prioritizers/Makefile | 1 +
 4 files changed, 9 insertions(+)

diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
index e46192c..11ab76f 100644
--- a/libmultipath/checkers/Makefile
+++ b/libmultipath/checkers/Makefile
@@ -5,6 +5,7 @@ include ../../Makefile.inc
 
 CFLAGS += -I..
 
+# If you add or remove a checker also update multipath/multipath.conf.5
 LIBS= \
 	libcheckcciss_tur.so \
 	libcheckreadsector0.so \
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index dd6a24b..3af85eb 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -1,3 +1,7 @@
+/*
+ * If you add or modify a value also update multipath/multipath.conf.5
+ * and the TEMPLATE in libmultipath/hwtable.c
+ */
 #define DEFAULT_UID_ATTRIBUTE	"ID_SERIAL"
 #define DEFAULT_UDEVDIR		"/dev"
 #define DEFAULT_MULTIPATHDIR	"/" LIB_STRING "/multipath"
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index 1933b6d..e8c6804 100644
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -1329,6 +1329,9 @@ snprint_deprecated (struct config *conf, char * buff, int len, void * data)
 
 #define __deprecated
 
+/*
+ * If you add or remove a keywork also update multipath/multipath.conf.5
+ */
 void
 init_keywords(vector keywords)
 {
diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
index eff5fc1..36b42e4 100644
--- a/libmultipath/prioritizers/Makefile
+++ b/libmultipath/prioritizers/Makefile
@@ -5,6 +5,7 @@ include ../../Makefile.inc
 
 CFLAGS += -I..
 
+# If you add or remove a prioritizer also update multipath/multipath.conf.5
 LIBS = \
 	libprioalua.so \
 	libprioconst.so \
-- 
2.7.4

[PATCH 07/11] multipath-tools: move DEFAULT_PRIO DEFAULT_PRIO_ARGS and DEFAULT_CHECKER to libmultipath/defaults.h

[Xose Vazquez Perez]

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>
---
 libmultipath/checkers.h | 3 +--
 libmultipath/defaults.h | 3 +++
 libmultipath/prio.h     | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h
index 502d2d9..4fb97c9 100644
--- a/libmultipath/checkers.h
+++ b/libmultipath/checkers.h
@@ -3,6 +3,7 @@
 
 #include "list.h"
 #include "memory.h"
+#include "defaults.h"
 
 /*
  *
@@ -86,8 +87,6 @@ enum path_check_state {
 #define CCISS_TUR    "cciss_tur"
 #define RBD          "rbd"
 
-#define DEFAULT_CHECKER TUR
-
 #define ASYNC_TIMEOUT_SEC	30
 
 /*
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index 3af85eb..9bf27d6 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -28,6 +28,9 @@
 #define DEFAULT_RETRIGGER_DELAY	10
 #define DEFAULT_RETRIGGER_TRIES	3
 #define DEFAULT_UEV_WAIT_TIMEOUT 30
+#define DEFAULT_PRIO		"const"
+#define DEFAULT_PRIO_ARGS	""
+#define DEFAULT_CHECKER		TUR
 
 #define DEFAULT_CHECKINT	5
 #define MAX_CHECKINT(a)		(a << 2)
diff --git a/libmultipath/prio.h b/libmultipath/prio.h
index 032028e..261105b 100644
--- a/libmultipath/prio.h
+++ b/libmultipath/prio.h
@@ -12,9 +12,7 @@ struct path;
 
 #include "list.h"
 #include "memory.h"
-
-#define DEFAULT_PRIO "const"
-#define DEFAULT_PRIO_ARGS ""
+#include "defaults.h"
 
 /*
  * Known prioritizers for use in hwtable.c
-- 
2.7.4

[PATCH 08/11] multipath-tools: add KOVE/XPD to hwtable

[Xose Vazquez Perez]

Info provided directly by the manufacturer: http://kove.net/xpd

Cc: Nick Russo <nick.russo@kove.net>
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>
---
 libmultipath/hwtable.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 063535c..8114d3e 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -839,6 +839,15 @@ static struct hwentry default_hw[] = {
 		.checker_name  = RBD,
 		.deferred_remove = DEFERRED_REMOVE_ON,
 	},
+	/*
+	 * Kove
+	 */
+	{
+		.vendor        = "KOVE",
+		.product       = "XPD",
+		.pgpolicy      = MULTIBUS,
+		.pgfailback    = FAILBACK_UNDEF,
+	},
 #if 0
 	/*
 	 * Copy this TEMPLATE to add new hardware.
-- 
2.7.4

[PATCH 09/11] multipath-tools: delete failback from IBM/2810XIV

[Xose Vazquez Perez]

nonsense with multibus as path_grouping_policy

Cc: Hannes Reinecke <hare@suse.de>
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>
---
 libmultipath/hwtable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 8114d3e..62633b1 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -517,7 +517,7 @@ static struct hwentry default_hw[] = {
 		.product       = "2810XIV",
 		.features      = "1 queue_if_no_path",
 		.pgpolicy      = MULTIBUS,
-		.pgfailback    = 15,
+		.pgfailback    = FAILBACK_UNDEF,
 	},
 		/*
 		 * IBM Power Virtual SCSI Devices
-- 
2.7.4

Re: [PATCH 01/11] multipath-tools: add support for all IBM Enterprise Storage Server / Shark family

[Christophe Varoqui]

[-- Attachment #1.1: Type: text/plain, Size: 1898 bytes --]

This set is merged.
Thanks.

On Thu, Aug 11, 2016 at 8:32 PM, Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:

> Only F20 and 800 were included:
> 2105F20 IBM Enterprise Storage Server Model F20
> 2105800 IBM TotalStorage Enterprise Storage Server Model 800
>
> Added all of them with just "^2105"
> 2105E10 IBM Enterprise Storage Server Model E10
> 2105E20 IBM Enterprise Storage Server Model E20
> 2105F10 IBM Enterprise Storage Server Model F10
> 2105750 IBM TotalStorage Enterprise Storage Server Model 750
>
> Cc: Hannes Reinecke <hare@suse.de>
> 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>
> ---
>  libmultipath/hwtable.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
> index edfd8fe..cd052e4 100644
> --- a/libmultipath/hwtable.c
> +++ b/libmultipath/hwtable.c
> @@ -444,17 +444,9 @@ static struct hwentry default_hw[] = {
>                 .pgfailback    = FAILBACK_UNDEF,
>         },
>         {
> -               /* Enterprise Storage Server / Shark 800 */
> +               /* Enterprise Storage Server / Shark family */
>                 .vendor        = "IBM",
> -               .product       = "^2105800",
> -               .features      = "1 queue_if_no_path",
> -               .pgpolicy      = GROUP_BY_SERIAL,
> -               .pgfailback    = FAILBACK_UNDEF,
> -       },
> -       {
> -               /* Enterprise Storage Server / Shark F20 */
> -               .vendor        = "IBM",
> -               .product       = "^2105F20",
> +               .product       = "^2105",
>                 .features      = "1 queue_if_no_path",
>                 .pgpolicy      = GROUP_BY_SERIAL,
>                 .pgfailback    = FAILBACK_UNDEF,
> --
> 2.7.4
>
>

[-- Attachment #1.2: Type: text/html, Size: 2855 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]