]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/blob - multipath-tools/patches/0007-RH-do-not-remove.patch
Change file layout of the makefiles.
[people/arne_f/ipfire-3.x.git] / multipath-tools / patches / 0007-RH-do-not-remove.patch
1 From b3519ef2eda768672d47c61f0acf8c87d74db427 Mon Sep 17 00:00:00 2001
2 From: Fabio M. Di Nitto <fdinitto@redhat.com>
3 Date: Tue, 13 Oct 2009 09:33:59 +0200
4 Subject: [PATCH 07/12] RH: do not remove
5
6 Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
7 ---
8 :100644 100644 5d3625a... 244b8d5... M multipathd/main.c
9 multipathd/main.c | 13 ++++++++++++-
10 1 files changed, 12 insertions(+), 1 deletions(-)
11
12 diff --git a/multipathd/main.c b/multipathd/main.c
13 index 5d3625a..244b8d5 100644
14 --- a/multipathd/main.c
15 +++ b/multipathd/main.c
16 @@ -290,8 +290,19 @@ ev_add_map (struct sysfs_device * dev, struct vectors * vecs)
17 static int
18 uev_remove_map (struct sysfs_device * dev, struct vectors * vecs)
19 {
20 + struct multipath * mpp;
21 +
22 condlog(2, "%s: remove map (uevent)", dev->kernel);
23 - return ev_remove_map(dev->kernel, vecs);
24 +
25 + mpp = find_mp_by_str(vecs->mpvec, dev->kernel);
26 + if (!mpp) {
27 + condlog(2, "%s: devmap not registered, can't remove",
28 + dev->kernel);
29 + return 0;
30 + }
31 + orphan_paths(vecs->pathvec, mpp);
32 + remove_map_and_stop_waiter(mpp, vecs, 1);
33 + return 0;
34 }
35
36 int
37 --
38 1.6.5.1
39