pool/lvm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 317706 from home:wanglh:branches:Base:System

Browse Source 
merged bnc#935623 with request for bnc#909358&bsc#932300

OBS-URL: https://build.opensuse.org/request/show/317706
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=133
This commit is contained in:
LiuhuaMelody Wang 2015-07-21 02:47:25 +00:00 committed by Git OBS Bridge
parent 6c5fd844aa
commit 3bba7b849b
3 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dmeventd-fix-dso-name-wrong-compare.patch Normal file
View File

@ -0,0 +1,36 @@
From d5246ee0d534677439cf4af780422fbb2c9068b2 Mon Sep 17 00:00:00 2001
From: Liuhua Wang <lwang@suse.com>
Date: Thu, 9 Jul 2015 15:44:20 +0800
Subject: [PATCH] dmeventd: fix dso name wrong compare
dso_name is thought as not empty and doesn't create monitor thread,
because lvm sets empty dso_name with "-".
Signed-off-by: Liuhua Wang <lwang@suse.com>
References: bnc#935623
---
daemons/dmeventd/dmeventd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git LVM2.2.02.120.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.120/daemons/dmeventd/dmeventd.c
index e8d1e3b..3b1952c 100644
--- LVM2.2.02.120.orig/daemons/dmeventd/dmeventd.c
+++ LVM2.2.02.120/daemons/dmeventd/dmeventd.c
@@ -1218,12 +1218,12 @@ static int _want_registered_device(char *dso_name, char *device_uuid,
struct thread_status *thread)
{
/* If DSO names and device paths are equal. */
- if (dso_name && device_uuid)
+ if (dso_name && strcmp(dso_name, "-") && device_uuid)
return !strcmp(dso_name, thread->dso_data->dso_name) &&
!strcmp(device_uuid, thread->device.uuid);
/* If DSO names are equal. */
- if (dso_name)
+ if (dso_name && strcmp(dso_name, "-"))
return !strcmp(dso_name, thread->dso_data->dso_name);
/* If device paths are equal. */
--
1.8.4.5

26
lvm2.changes
View File

@ -1,16 +1,24 @@
-------------------------------------------------------------------
Tue Jul 14 09:05:13 UTC 2015 - lwang@suse.com
- dmeventd: fix dso_name compare error. dso_name is thought as not
empty and doesn't create monitor thread. (bnc#935623)
add: dmeventd-fix-dso-name-wrong-compare.patch
-------------------------------------------------------------------
Tue Jul 14 05:41:55 UTC 2015 - lzhong@suse.com
-13-dm-disk.rules: Import ID_FS_XXX variables from udev
database(bnc#909358)
If the disk is unavailable we need to import the existing ID_FS_XXX
variables from the database, otherwise the filesystem UUID won't
be set and the by-uuid symlink will disappear, leading to
intermittent boot failures
+ Import-ID_FS_XXX-variables-bnc909358.patch
- 13-dm-disk.rules: Import ID_FS_XXX variables from udev
database(bnc#909358)
If the disk is unavailable we need to import the existing ID_FS_XXX
variables from the database, otherwise the filesystem UUID won't
be set and the by-uuid symlink will disappear, leading to
intermittent boot failures
+ Import-ID_FS_XXX-variables-bnc909358.patch
- 10-dm.rules: Reset state variables for spurious events (bsc#932300)
+ 10-dm.rules-Reset-state-variable-for-spurious-events.patch
-10-dm.rules: Reset state variables for spurious events (bsc#932300)
+ 10-dm.rules-Reset-state-variable-for-spurious-events.patch
-------------------------------------------------------------------
Tue May 19 16:30:47 UTC 2015 - jeffm@suse.com

2
lvm2.spec
View File

@ -73,6 +73,7 @@ Patch1015: fix-closedown-before-thread-finish.patch
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
Patch1017: version-plugins-in-libdir
Patch1018: dmeventd-fix-dso-name-wrong-compare.patch
# device-mapper patches
#suse, bnc#707253(also merged patch for bnc#479104)
@ -141,6 +142,7 @@ Volume Manager.
%patch1015 -p1
%patch1016 -p1
%patch1017 -p1
%patch1018 -p1
%patch2000 -p1
%patch2001 -p1