diff options
| author | Benjamin Marzinski <bmarzins@redhat.com> | 2013-04-26 11:43:50 -0500 |
|---|---|---|
| committer | Benjamin Marzinski <bmarzins@redhat.com> | 2013-04-26 11:43:50 -0500 |
| commit | eaac5636447a25b9c6dcf61c60d8a206cc23a838 (patch) | |
| tree | 2139358c18b207f425f36434441c36553e4da5d2 /0020-RHBZ-907360-static-pthread-init.patch | |
| parent | 0b94e5c7c22f27799d350698962929750d943bd7 (diff) | |
| download | device-mapper-multipath-eaac5636447a25b9c6dcf61c60d8a206cc23a838.tar.gz device-mapper-multipath-eaac5636447a25b9c6dcf61c60d8a206cc23a838.tar.xz device-mapper-multipath-eaac5636447a25b9c6dcf61c60d8a206cc23a838.zip | |
device-mapper-multipath-0.4.9-49
Modify 0020-RHBZ-907360-static-pthread-init.patch
* Don't initialize uevent list twice
Add 0029-RH-no-prio-put-msg.patch
Add 0030-RHBZ-916528-override-queue-no-daemon.patch
* Default to "queue_without_daemon no"
* Add "forcequeueing daemon" and "restorequeueing daemon" cli commands
Modify spec file to force queue_without_daemon when restarting
multipathd on upgrades.
Diffstat (limited to '0020-RHBZ-907360-static-pthread-init.patch')
| -rw-r--r-- | 0020-RHBZ-907360-static-pthread-init.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/0020-RHBZ-907360-static-pthread-init.patch b/0020-RHBZ-907360-static-pthread-init.patch index 00e9a45..bafa5ce 100644 --- a/0020-RHBZ-907360-static-pthread-init.patch +++ b/0020-RHBZ-907360-static-pthread-init.patch @@ -1,6 +1,6 @@ --- - libmultipath/uevent.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + libmultipath/uevent.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) Index: multipath-tools-130222/libmultipath/uevent.c =================================================================== @@ -19,16 +19,18 @@ Index: multipath-tools-130222/libmultipath/uevent.c uev_trigger *my_uev_trigger; void * my_trigger_data; int servicing_uev; -@@ -411,8 +413,6 @@ int uevent_listen(void) +@@ -409,10 +411,6 @@ int uevent_listen(void) + * thereby not getting to empty the socket's receive buffer queue + * often enough. */ - INIT_LIST_HEAD(&uevq); - +- INIT_LIST_HEAD(&uevq); +- - pthread_mutex_init(uevq_lockp, NULL); - pthread_cond_init(uev_condp, NULL); pthread_cleanup_push(uevq_stop, NULL); monitor = udev_monitor_new_from_netlink(conf->udev, "udev"); -@@ -525,8 +525,6 @@ out: +@@ -525,8 +523,6 @@ out: if (need_failback) err = failback_listen(); pthread_cleanup_pop(1); |