Hello community,
here is the log from the commit of package multipath-tools
checked in at Mon Oct 16 19:04:48 CEST 2006.
--------
--- multipath-tools/multipath-tools.changes 2006-09-14 00:18:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/multipath-tools/multipath-tools.changes 2006-09-25 10:04:39.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 25 10:03:49 CEST 2006 - hare@suse.de
+
+- update to latest fixes from git tree
+- remove fixes integrated in upstream
+- fixup udev rule (#203688)
+
+-------------------------------------------------------------------
Old:
----
multipath-tools-fixup-hwtable-regexp
multipath-tools-fixup-return-code
multipath-tools-ibm-3526-update
multipath-tools-pp_tpc-disable-debug-output.patch
multipath-tools-remove-obsolete-option-from-manpage
multipath-tools-split-off-DS6000
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.O4MItJ/_old 2006-10-16 19:04:02.000000000 +0200
+++ /var/tmp/diff_new_pack.O4MItJ/_new 2006-10-16 19:04:02.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Autoreqprov: on
Version: 0.4.7
-Release: 6
+Release: 13
Summary: Tools to Manage Multipathed Devices with the device-mapper
Source: multipath-tools-%{version}.tar.bz2
Source1: multipathd
@@ -31,14 +31,8 @@
Source7: 72-multipath-compat.rules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: %{name}-git-update.patch
-Patch4: %{name}-ibm-3526-update
-Patch5: %{name}-pp_tpc-disable-debug-output.patch
-Patch6: %{name}-fixup-return-code
Patch10: %{name}-online-device.patch
Patch11: %{name}-no-gz-for-manpage
-Patch12: %{name}-split-off-DS6000
-Patch13: %{name}-remove-obsolete-option-from-manpage
-Patch14: %{name}-fixup-hwtable-regexp
Patch15: %{name}-strip.patch
%description
@@ -65,13 +59,7 @@
%prep
%setup -n multipath-tools-%{version}
%patch0 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
%patch15
%build
@@ -128,6 +116,10 @@
%{_mandir}/man8/mpath_prio_alua.8*
%changelog -n multipath-tools
+* Mon Sep 25 2006 - hare@suse.de
+- update to latest fixes from git tree
+- remove fixes integrated in upstream
+- fixup udev rule (#203688)
* Thu Sep 14 2006 - ro@suse.de
- use device-mapper-devel in BuildRequires
* Thu Aug 31 2006 - hare@suse.de
++++++ 71-multipath.rules ++++++
--- multipath-tools/71-multipath.rules 2006-08-31 12:26:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/multipath-tools/71-multipath.rules 2006-09-25 10:02:06.000000000 +0200
@@ -5,20 +5,20 @@
#
KERNEL!="dm-*", GOTO="multipath_end"
-ACTION=="offline|remove", GOTO="multipath_end"
+ACTION=="add|remove", GOTO="multipath_end"
-ACTION=="online", IMPORT{program}=="/sbin/kpartx_id %M %m"
+ACTION=="change", IMPORT{program}=="/sbin/kpartx_id %M %m"
# Create persistent links for tables
-ACTION=="online", ENV{ID_DM_TABLE}=="mpath|dmraid", ENV{ID_DM_TYPE}=="?*", \
+ACTION=="change", ENV{ID_DM_TABLE}=="mpath|dmraid", ENV{ID_DM_TYPE}=="?*", \
SYMLINK+="disk/by-id/$env{ID_DM_TYPE}-$env{ID_DM_NAME}"
# Create dm tables for partitions
-ACTION=="online", ENV{ID_DM_TABLE}=="mpath|dmraid", \
+ACTION=="change", ENV{ID_DM_TABLE}=="mpath|dmraid", \
RUN+="/sbin/kpartx -a /dev/mapper/$env{ID_DM_NAME}"
# Create persistent links for partitions
-ACTION=="online", ENV{ID_DM_TABLE}=="part", ENV{ID_DM_TYPE}=="?*", \
+ACTION=="change", ENV{ID_DM_TABLE}=="part", ENV{ID_DM_TYPE}=="?*", \
SYMLINK+="disk/by-id/$env{ID_DM_TYPE}-$env{ID_DM_NAME}-part$env{ID_DM_PART}
"
LABEL="multipath_end"
++++++ multipath-tools-git-update.patch ++++++
--- /var/tmp/diff_new_pack.O4MItJ/_old 2006-10-16 19:04:02.000000000 +0200
+++ /var/tmp/diff_new_pack.O4MItJ/_new 2006-10-16 19:04:02.000000000 +0200
@@ -1,59 +1,3 @@
- Makefile | 4
- devmap_name/devmap_name.8 | 2
- kpartx/devmapper.c | 46 ++-
- kpartx/devmapper.h | 4
- kpartx/kpartx.8 | 2
- kpartx/kpartx.c | 15 -
- libcheckers/checkers.h | 15 +
- libcheckers/emc_clariion.c | 13 -
- libcheckers/hp_sw.c | 3
- libcheckers/readsector0.c | 1
- libcheckers/tur.c | 2
- libmultipath/Makefile | 3
- libmultipath/callout.c | 2
- libmultipath/config.c | 13 -
- libmultipath/config.h | 3
- libmultipath/configure.c | 50 +--
- libmultipath/configure.h | 2
- libmultipath/debug.c | 5
- libmultipath/debug.h | 4
- libmultipath/devmapper.c | 32 ++
- libmultipath/discovery.c | 18 +
- libmultipath/discovery.h | 6
- libmultipath/hwtable.c | 132 +++++--
- libmultipath/lock.c | 8
- libmultipath/lock.h | 22 +
- libmultipath/parser.c | 15 +
- libmultipath/parser.h | 1
- libmultipath/pgpolicies.h | 2
- libmultipath/print.c | 43 ++
- libmultipath/propsel.c | 33 +-
- libmultipath/structs.c | 8
- libmultipath/structs.h | 9
- libmultipath/structs_vec.c | 94 +++++
- libmultipath/structs_vec.h | 14 -
- libmultipath/util.c | 9
- libmultipath/util.h | 1
- libmultipath/version.h | 37 ++
- libmultipath/waiter.c | 234 +++++++++++++
- libmultipath/waiter.h | 23 +
- multipath-tools.spec.in | 1
- multipath.conf.annotated | 6
- multipath/main.c | 7
- multipath/main.h | 39 --
- multipath/multipath.8 | 4
- multipathd/cli.c | 3
- multipathd/cli_handlers.c | 6
- multipathd/main.c | 385 +--------------------
- multipathd/multipathd.8 | 6
- path_priority/pp_alua/mpath_prio_alua.8 | 2
- path_priority/pp_alua/rtpg.c | 2
- path_priority/pp_alua/spc3.h | 4
- path_priority/pp_balance_units/pp_balance_units.c | 74 ++--
- path_priority/pp_hds_modular/Makefile | 22 +
- path_priority/pp_hds_modular/pp_hds_modular.c | 252 ++++++++++++++
- 54 files changed, 1122 insertions(+), 621 deletions(-)
-
diff --git a/Makefile b/Makefile
index 83ae2fe..aacede3 100644
--- a/Makefile
@@ -610,7 +554,7 @@
#endif /* DAEMON */
diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4328036..c0765ae 100644
+index 4328036..69eecde 100644
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -11,6 +11,7 @@ #include
@@ -632,7 +576,15 @@
static void
dm_dummy_log (int level, const char *file, int line, const char *f, ...)
{
-@@ -113,6 +118,7 @@ dm_addmap (int task, const char *name, c
+@@ -100,6 +105,7 @@ dm_simplecmd (int task, const char *name
+ goto out;
+
+ dm_task_no_open_count(dmt);
++ dm_task_skip_lockfs(dmt); /* for DM_DEVICE_RESUME */
+
+ r = dm_task_run (dmt);
+
+@@ -113,6 +119,7 @@ dm_addmap (int task, const char *name, c
const char *params, unsigned long long size, const char *uuid) {
int r = 0;
struct dm_task *dmt;
@@ -640,7 +592,7 @@
if (!(dmt = dm_task_create (task)))
return 0;
-@@ -123,13 +129,26 @@ dm_addmap (int task, const char *name, c
+@@ -123,13 +130,26 @@ dm_addmap (int task, const char *name, c
if (!dm_task_add_target (dmt, 0, size, target, params))
goto addout;
@@ -669,7 +621,7 @@
addout:
dm_task_destroy (dmt);
return r;
-@@ -215,8 +234,12 @@ dm_get_uuid(char *name, char *uuid)
+@@ -215,8 +235,12 @@ dm_get_uuid(char *name, char *uuid)
goto uuidout;
uuidtmp = dm_task_get_uuid(dmt);
@@ -684,7 +636,7 @@
else
uuid[0] = '\0';
-@@ -591,6 +614,7 @@ dm_get_maps (vector mp, char * type)
+@@ -591,6 +615,7 @@ dm_get_maps (vector mp, char * type)
goto out1;
dm_get_uuid(names->name, mpp->wwid);
@@ -786,11 +738,27 @@
int do_tur (char *);
int devt2devname (char *, char *);
int pathinfo (struct path *, vector hwtable, int mask);
+diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c
+index 2b170c6..d483524 100644
+--- a/libmultipath/dmparser.c
++++ b/libmultipath/dmparser.c
+@@ -307,8 +307,9 @@ #endif
+ p += get_word(p, &word);
+ mpp->minio = atoi(word);
+
+- if (mpp->rr_weight)
+- mpp->minio /= mpp->rr_weight;
++ if (mp->rr_weight == RR_WEIGHT_PRIO &&
++ pp->priority)
++ mpp->minio /= pp->priority;
+
+ FREE(word);
+ }
diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
-index 5c7d625..deb99e5 100644
+index 5c7d625..b56c231 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
-@@ -12,13 +12,34 @@ #include "pgpolicies.h"
+@@ -12,20 +12,20 @@ #include "pgpolicies.h"
* Tuning suggestions on these parameters should go to
* dm-devel@redhat.com
*
@@ -803,51 +771,84 @@
/*
- * StorageWorks controler family
+ * Apple controller family
-+ *
+ *
+- * Maintainer : Christophe Varoqui
+- * Mail : christophe.varoqui@free.fr
+ * Maintainer : Shyam Sundar
+ * Mail : g.shyamsundar@yahoo.co.in
-+ */
-+ {
+ */
+ {
+- .vendor = "3PARdata",
+- .product = "VV",
+ .vendor = "APPLE*",
+ .product = "Xserve RAID ",
-+ .getuid = DEFAULT_GETUID,
-+ .getprio = NULL,
-+ .features = DEFAULT_FEATURES,
+ .getuid = DEFAULT_GETUID,
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
+@@ -38,24 +38,30 @@ static struct hwentry default_hw[] = {
+ .minio = DEFAULT_MINIO,
+ .checker_name = DEFAULT_CHECKER,
+ },
++ /*
++ * StorageWorks controller family
++ *
++ * Maintainer : Christophe Varoqui
++ * Mail : christophe.varoqui@free.fr
++ */
+ {
+- .vendor = "DEC",
+- .product = "HSG80",
++ .vendor = "3PARdata",
++ .product = "VV",
+ .getuid = DEFAULT_GETUID,
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
+- .hwhandler = "1 hp_sw",
+ .hwhandler = DEFAULT_HWHANDLER,
-+ .selector = DEFAULT_SELECTOR,
+ .selector = DEFAULT_SELECTOR,
+- .pgpolicy = GROUP_BY_SERIAL,
+ .pgpolicy = MULTIBUS,
-+ .pgfailback = FAILBACK_UNDEF,
-+ .rr_weight = RR_WEIGHT_NONE,
-+ .no_path_retry = NO_PATH_RETRY_UNDEF,
-+ .minio = DEFAULT_MINIO,
+ .pgfailback = FAILBACK_UNDEF,
+ .rr_weight = RR_WEIGHT_NONE,
+ .no_path_retry = NO_PATH_RETRY_UNDEF,
+ .minio = DEFAULT_MINIO,
+- .checker_name = HP_SW,
+ .checker_name = DEFAULT_CHECKER,
-+ },
-+ /*
-+ * StorageWorks controller family
- *
- * Maintainer : Christophe Varoqui
- * Mail : christophe.varoqui@free.fr
-@@ -70,22 +91,7 @@ static struct hwentry default_hw[] = {
},
{
- .vendor = "HP",
+- .vendor = "{COMPAQ,HP}",
+- .product = "{MSA,HSV}1*",
++ .vendor = "DEC",
++ .product = "HSG80",
+ .getuid = DEFAULT_GETUID,
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
+@@ -69,23 +75,23 @@ static struct hwentry default_hw[] = {
+ .checker_name = HP_SW,
+ },
+ {
+- .vendor = "HP",
- .product = "HSV2*",
-- .getuid = DEFAULT_GETUID,
-- .getprio = NULL,
-- .features = DEFAULT_FEATURES,
++ .vendor = "(COMPAQ|HP)",
++ .product = "(MSA|HSV)1.*",
+ .getuid = DEFAULT_GETUID,
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
- .hwhandler = DEFAULT_HWHANDLER,
-- .selector = DEFAULT_SELECTOR,
-- .pgpolicy = MULTIBUS,
-- .pgfailback = FAILBACK_UNDEF,
-- .rr_weight = RR_WEIGHT_NONE,
-- .no_path_retry = NO_PATH_RETRY_UNDEF,
-- .minio = DEFAULT_MINIO,
++ .hwhandler = "1 hp_sw",
+ .selector = DEFAULT_SELECTOR,
+ .pgpolicy = MULTIBUS,
+ .pgfailback = FAILBACK_UNDEF,
+ .rr_weight = RR_WEIGHT_NONE,
+ .no_path_retry = NO_PATH_RETRY_UNDEF,
+ .minio = DEFAULT_MINIO,
- .checker_name = READSECTOR0,
-- },
-- {
-- .vendor = "HP",
++ .checker_name = HP_SW,
+ },
+ {
+ .vendor = "HP",
- .product = "DF[456]00",
-+ .product = "{HSV2*,A6189A}",
++ .product = "(HSV2.*|A6189A)",
.getuid = DEFAULT_GETUID,
.getprio = NULL,
.features = DEFAULT_FEATURES,
@@ -869,8 +870,21 @@
*
* Maintainer : Edward Goggin, EMC
* Mail : egoggin@emc.com
-@@ -145,7 +151,7 @@ static struct hwentry default_hw[] = {
- .product = "*",
+@@ -128,7 +134,7 @@ static struct hwentry default_hw[] = {
+ {
+ .vendor = "EMC",
+ .product = "SYMMETRIX",
+- .getuid = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
++ .getuid = "scsi_id -g -u -ppre-spc3-83 -s /block/%n",
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
+ .hwhandler = DEFAULT_HWHANDLER,
+@@ -142,10 +148,10 @@ static struct hwentry default_hw[] = {
+ },
+ {
+ .vendor = "DGC",
+- .product = "*",
++ .product = ".*",
.bl_product = "LUNZ",
.getuid = DEFAULT_GETUID,
- .getprio = "/sbin/mpath_prio_emc /dev/%n",
@@ -902,8 +916,8 @@
{
- .vendor = "HITACHI",
- .product = "{A6189A,OPEN-}",
-+ .vendor = "{HITACHI,HP}",
-+ .product = "OPEN-*",
++ .vendor = "(HITACHI|HP)",
++ .product = "OPEN-.*",
.getuid = DEFAULT_GETUID,
.getprio = NULL,
.features = DEFAULT_FEATURES,
@@ -913,9 +927,9 @@
},
+ {
+ .vendor = "HITACHI",
-+ .product = "DF*",
++ .product = "DF.*",
+ .getuid = DEFAULT_GETUID,
-+ .getprio = "/sbin/mpath_prio_hds_modular %d",
++ .getprio = "mpath_prio_hds_modular %d",
+ .features = DEFAULT_FEATURES,
+ .hwhandler = DEFAULT_HWHANDLER,
+ .selector = DEFAULT_SELECTOR,
@@ -935,43 +949,85 @@
* Mail : hare@suse.de
*/
{
-@@ -224,7 +245,7 @@ static struct hwentry default_hw[] = {
+@@ -224,7 +245,23 @@ static struct hwentry default_hw[] = {
.vendor = "IBM",
.product = "1742",
.getuid = DEFAULT_GETUID,
- .getprio = "/sbin/mpath_prio_tpc /dev/%n",
+ .getprio = "mpath_prio_tpc /dev/%n",
++ .features = DEFAULT_FEATURES,
++ .hwhandler = DEFAULT_HWHANDLER,
++ .selector = DEFAULT_SELECTOR,
++ .pgpolicy = GROUP_BY_PRIO,
++ .pgfailback = -FAILBACK_IMMEDIATE,
++ .rr_weight = RR_WEIGHT_NONE,
++ .no_path_retry = NO_PATH_RETRY_UNDEF,
++ .minio = DEFAULT_MINIO,
++ .checker_name = TUR,
++ },
++ {
++ /* IBM Netfinity Fibre Channel RAID Controller Unit */
++ .vendor = "IBM",
++ .product = "3526",
++ .getuid = DEFAULT_GETUID,
++ .getprio = "mpath_prio_tpc /dev/%n",
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
.selector = DEFAULT_SELECTOR,
-@@ -254,7 +275,7 @@ static struct hwentry default_hw[] = {
+@@ -254,7 +291,7 @@ static struct hwentry default_hw[] = {
{
/* IBM ESS F20 aka Shark */
.vendor = "IBM",
- .product = "2105F20",
-+ .product = "2105{800,F20}",
++ .product = "2105(800|F20)",
.getuid = DEFAULT_GETUID,
.getprio = NULL,
.features = "1 queue_if_no_path",
-@@ -272,7 +293,7 @@ static struct hwentry default_hw[] = {
+@@ -268,11 +305,11 @@ static struct hwentry default_hw[] = {
+ .checker_name = TUR,
+ },
+ {
+- /* IBM DS6000 / SAN Volume Controller */
++ /* IBM DS6000 */
.vendor = "IBM",
- .product = "{1750500,2145}",
+- .product = "{1750500,2145}",
++ .product = "1750500",
.getuid = DEFAULT_GETUID,
- .getprio = "/sbin/mpath_prio_alua /dev/%n",
+ .getprio = "mpath_prio_alua /dev/%n",
.features = "1 queue_if_no_path",
.hwhandler = DEFAULT_HWHANDLER,
.selector = DEFAULT_SELECTOR,
-@@ -303,7 +324,7 @@ static struct hwentry default_hw[] = {
+@@ -300,10 +337,27 @@ static struct hwentry default_hw[] = {
+ .checker_name = TUR,
+ },
+ {
++ /* IBM SAN Volume Controller */
++ .vendor = "IBM",
++ .product = "2145",
++ .getuid = DEFAULT_GETUID,
++ .getprio = "mpath_prio_alua /dev/%n",
++ .features = "1 queue_if_no_path",
++ .hwhandler = DEFAULT_HWHANDLER,
++ .selector = DEFAULT_SELECTOR,
++ .pgpolicy = GROUP_BY_PRIO,
++ .pgfailback = -FAILBACK_IMMEDIATE,
++ .rr_weight = RR_WEIGHT_NONE,
++ .no_path_retry = NO_PATH_RETRY_UNDEF,
++ .minio = DEFAULT_MINIO,
++ .checker_name = TUR,
++ },
++ {
/* IBM S/390 ECKD DASD */
.vendor = "IBM",
.product = "S/390 DASD ECKD",
- .getuid = "/sbin/dasdview -j /dev/%n",
-+ .getuid = "/sbin/dasd_id /dev/%n",
++ .bl_product = "S/390.*",
++ .getuid = "dasd_id /dev/%n",
.getprio = NULL,
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
-@@ -315,29 +336,50 @@ static struct hwentry default_hw[] = {
+@@ -315,29 +369,50 @@ static struct hwentry default_hw[] = {
.minio = DEFAULT_MINIO,
.checker_name = DIRECTIO,
},
@@ -1031,7 +1087,7 @@
*
* Maintainer : Christophe Varoqui
* Mail : christophe.varoqui@free.fr
-@@ -346,7 +388,7 @@ static struct hwentry default_hw[] = {
+@@ -346,7 +421,7 @@ static struct hwentry default_hw[] = {
.vendor = "Pillar",
.product = "Axiom 500",
.getuid = DEFAULT_GETUID,
@@ -1040,7 +1096,7 @@
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
.selector = DEFAULT_SELECTOR,
-@@ -382,7 +424,7 @@ static struct hwentry default_hw[] = {
+@@ -382,7 +457,7 @@ static struct hwentry default_hw[] = {
.vendor = "SGI",
.product = "TP9[45]00",
.getuid = DEFAULT_GETUID,
@@ -1049,7 +1105,7 @@
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
.selector = DEFAULT_SELECTOR,
-@@ -403,7 +445,7 @@ static struct hwentry default_hw[] = {
+@@ -403,7 +478,7 @@ static struct hwentry default_hw[] = {
.vendor = "STK",
.product = "OPENstorage D280",
.getuid = DEFAULT_GETUID,
@@ -1058,6 +1114,15 @@
.features = DEFAULT_FEATURES,
.hwhandler = DEFAULT_HWHANDLER,
.selector = DEFAULT_SELECTOR,
+@@ -422,7 +497,7 @@ static struct hwentry default_hw[] = {
+ */
+ {
+ .vendor = "SUN",
+- .product = "{StorEdge 3510,T4}",
++ .product = "(StorEdge 3510|T4)",
+ .getuid = DEFAULT_GETUID,
+ .getprio = NULL,
+ .features = DEFAULT_FEATURES,
diff --git a/libmultipath/lock.c b/libmultipath/lock.c
new file mode 100644
index 0000000..0ca8783
@@ -2002,7 +2067,7 @@
# # multibus = all valid paths in 1 priority
# # group
diff --git a/multipath/main.c b/multipath/main.c
-index 98f7207..c1257a2 100644
+index 98f7207..b6f8814 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -46,8 +46,7 @@ #include
@@ -2015,7 +2080,19 @@
static int
filter_pathvec (vector pathvec, char * refwwid)
-@@ -305,7 +304,7 @@ main (int argc, char *argv[])
+@@ -281,8 +280,10 @@ configure (void)
+
+ filter_pathvec(pathvec, refwwid);
+
+- if (conf->list)
++ if (conf->list) {
++ r = 0;
+ goto out;
++ }
+
+ /*
+ * core logic entry point
+@@ -305,7 +306,7 @@ main (int argc, char *argv[])
int arg;
extern char *optarg;
extern int optind;
@@ -2024,7 +2101,7 @@
if (getuid() != 0) {
fprintf(stderr, "need to be root\n");
-@@ -322,7 +321,7 @@ main (int argc, char *argv[])
+@@ -322,7 +323,7 @@ main (int argc, char *argv[])
if (load_config(DEFAULT_CONFIGFILE))
exit(1);
@@ -2079,7 +2156,7 @@
-
-#endif
diff --git a/multipath/multipath.8 b/multipath/multipath.8
-index 7133598..0a0138f 100644
+index 7133598..70a7801 100644
--- a/multipath/multipath.8
+++ b/multipath/multipath.8
@@ -1,4 +1,4 @@
@@ -2088,7 +2165,20 @@
.SH NAME
multipath \- Device mapper target autoconfig
.SH SYNOPSIS
-@@ -64,7 +64,7 @@ all paths in 1 priority group
+@@ -38,12 +38,6 @@ show the current multipath topology from
+ .B \-ll
+ show the current multipath topology from all available information (sysfs, the device mapper, path checkers ...)
+ .TP
+-.TP
+-.BI \-D " major:minor"
+-update only the devmap the path pointed by
+-.I major:minor
+-is in
+-.TP
+ .B \-f
+ flush a multipath device map specified as parameter, if unused
+ .TP
+@@ -64,7 +58,7 @@ all paths in 1 priority group
1 priority group per serial
.TP
.B group_by_prio
@@ -3228,3 +3318,46 @@
+ exit(1);
+}
+
+diff --git a/path_priority/pp_tpc/pp_tpc.c b/path_priority/pp_tpc/pp_tpc.c
+index 76e7c47..a7ed7ad 100644
+--- a/path_priority/pp_tpc/pp_tpc.c
++++ b/path_priority/pp_tpc/pp_tpc.c
+@@ -62,18 +62,13 @@ int sgi_tpc_prio(const char *dev)
+ goto out;
+ }
+
+- if ( /* Auto-volume Transfer Enabled */
+- (sense_buffer[8] & 0x80) != 0x80 ) {
+- fprintf(stderr, "Auto-volume Transfer not enabled");
+- }
+-
+ if ( /* Current Volume Path Bit */
+ ( sense_buffer[8] & 0x01) == 0x01 ) {
+ /*
+ * This volume was owned by the controller receiving
+ * the inquiry command.
+ */
+- ret |= 0x02;
++ ret |= 0x01;
+ }
+
+ /* Volume Preferred Path Priority */
+@@ -83,7 +78,7 @@ int sgi_tpc_prio(const char *dev)
+ * Access to this volume is most preferred through
+ * this path and other paths with this value.
+ */
+- ret |= 0x04;
++ ret |= 0x02;
+ break;
+ case 0x02:
+ /*
+@@ -91,8 +86,7 @@ int sgi_tpc_prio(const char *dev)
+ * as a secondary path. Typically this path would be used
+ * for fail-over situations.
+ */
+- ret |= 0x01;
+- break;
++ /* Fallthrough */
+ default:
+ /* Reserved values */
+ break;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org