Patch was causing a segfault during booting and is being replaced by the following series.
Signed-off-by: Hannes Reinecke <[email protected]> --- multipathd/main.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index c0ca571..3b79aef 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -580,11 +580,6 @@ uev_add_path (struct uevent *uev, struct vectors * vecs) pthread_cleanup_push(cleanup_lock, &vecs->lock); lock(vecs->lock); pthread_testcancel(); - if (filter_devnode(conf->blist_devnode, conf->elist_devnode, - uev->kernel) > 0) { - ret = 0; - goto out_unlock; - } pp = find_path_by_dev(vecs->pathvec, uev->kernel); if (pp) { int r; @@ -642,7 +637,6 @@ uev_add_path (struct uevent *uev, struct vectors * vecs) free_path(pp); ret = 1; } -out_unlock: lock_cleanup_pop(vecs->lock); return ret; } @@ -786,23 +780,22 @@ fail: static int uev_remove_path (struct uevent *uev, struct vectors * vecs) { - struct path *pp = NULL; - int ret = 0; + struct path *pp; + int ret; condlog(2, "%s: remove path (uevent)", uev->kernel); pthread_cleanup_push(cleanup_lock, &vecs->lock); lock(vecs->lock); pthread_testcancel(); - if (filter_devnode(conf->blist_devnode, conf->elist_devnode, - uev->kernel) == 0) { - pp = find_path_by_dev(vecs->pathvec, uev->kernel); - if (pp) - ret = ev_remove_path(pp, vecs); - else - /* Not an error; path might have been purged earlier */ - condlog(0, "%s: path already removed", uev->kernel); - } + pp = find_path_by_dev(vecs->pathvec, uev->kernel); + if (pp) + ret = ev_remove_path(pp, vecs); lock_cleanup_pop(vecs->lock); + if (!pp) { + /* Not an error; path might have been purged earlier */ + condlog(0, "%s: path already removed", uev->kernel); + return 0; + } return ret; } @@ -912,7 +905,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) ro = uevent_get_disk_ro(uev); if (ro >= 0) { - struct path * pp = NULL; + struct path * pp; struct multipath *mpp = NULL; condlog(2, "%s: update path write_protect to '%d' (uevent)", @@ -925,10 +918,6 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) * need to be at the same indentation level, hence * this slightly convoluted codepath. */ - if (filter_devnode(conf->blist_devnode, conf->elist_devnode, - uev->kernel) > 0) { - goto out_unlock; - } pp = find_path_by_dev(vecs->pathvec, uev->kernel); if (pp) { if (pp->initialized == INIT_REQUESTED_UDEV) { @@ -948,13 +937,11 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) uev->kernel, mpp->alias, retval); } } - out_unlock: lock_cleanup_pop(vecs->lock); if (!pp) { - if (retval) - condlog(0, "%s: spurious uevent, path not found", - uev->kernel); - return retval; + condlog(0, "%s: spurious uevent, path not found", + uev->kernel); + return 1; } if (retval == 2) return uev_add_path(uev, vecs); @@ -1072,6 +1059,10 @@ uev_trigger (struct uevent * uev, void * trigger_data) /* * path add/remove event */ + if (filter_devnode(conf->blist_devnode, conf->elist_devnode, + uev->kernel) > 0) + goto out; + if (!strncmp(uev->action, "add", 3)) { r = uev_add_path(uev, vecs); goto out; -- 2.6.6 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
