f97259d84a
Rename files * Previous patch 0006-0014 are now patches 0008-0016 Add 0006-multipathd-avoid-null-pointer-dereference-in-LOG_MSG.patch Add 0007-multipath-blacklist-zram-devices.patch * The above 2 patches have been submitted upstream Resolves: bz #1672761
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Wed, 6 Feb 2019 13:46:10 -0600
|
|
Subject: [PATCH] multipath: blacklist zram devices
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/blacklist.c | 2 +-
|
|
multipath/multipath.conf.5 | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
|
|
index 709895e..e0d0279 100644
|
|
--- a/libmultipath/blacklist.c
|
|
+++ b/libmultipath/blacklist.c
|
|
@@ -192,7 +192,7 @@ setup_default_blist (struct config * conf)
|
|
char * str;
|
|
int i;
|
|
|
|
- str = STRDUP("^(ram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]");
|
|
+ str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]");
|
|
if (!str)
|
|
return 1;
|
|
if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
|
|
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
|
|
index 88b8edd..0fe8461 100644
|
|
--- a/multipath/multipath.conf.5
|
|
+++ b/multipath/multipath.conf.5
|
|
@@ -1218,7 +1218,7 @@ Regular expression matching the device nodes to be excluded/included.
|
|
.RS
|
|
.PP
|
|
The default \fIblacklist\fR consists of the regular expressions
|
|
-"^(ram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]" and
|
|
+"^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]" and
|
|
"^(td|hd|vd)[a-z]". This causes virtual devices, non-disk devices, and some other
|
|
device types to be excluded from multipath handling by default.
|
|
.RE
|
|
--
|
|
2.17.2
|
|
|