forked from pool/systemd
8d0e9d5913
- Add upstream patches for hwdb 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch 0003-keymap-Fix-HP-Pavillon-DV7.patch 0004-hwdb-update-format-description-and-document-reloadin.patch 0008-hwdb-update.patch - Port back and add the missed upstream patches from 2014/08/22 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch 0006-login-share-VT-signal-handler-between-sessions.patch - Add upstream patches 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch 0002-switch-root-umount-the-old-root-correctly.patch 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch - man pages from section 3 are developer docs, move them to the -devel package. - Add patch 0001-let-systemctl-completion-ignore-at-names.patch to remove error messages for tab completion for systemctl isolate (bnc#892162) OBS-URL: https://build.opensuse.org/request/show/246497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=200
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
Based on 85529c815b47c22839e0f148af67fd37e977cbfa Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Tue, 12 Aug 2014 19:29:27 +0200
|
|
Subject: [PATCH] sd-resolve: fix allocation if query ids, never reuse them
|
|
|
|
---
|
|
src/libsystemd/sd-resolve/sd-resolve.c | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
--- src/libsystemd/sd-resolve/sd-resolve.c
|
|
+++ src/libsystemd/sd-resolve/sd-resolve.c 2014-08-22 14:18:24.838235343 +0000
|
|
@@ -81,7 +81,7 @@ struct sd_resolve {
|
|
pthread_t workers[WORKERS_MAX];
|
|
unsigned n_valid_workers;
|
|
|
|
- unsigned current_id, current_index;
|
|
+ unsigned current_id;
|
|
sd_resolve_query* queries[QUERIES_MAX];
|
|
unsigned n_queries;
|
|
|
|
@@ -892,21 +892,17 @@ static int alloc_query(sd_resolve *resol
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- while (resolve->queries[resolve->current_index]) {
|
|
- resolve->current_index++;
|
|
+ while (resolve->queries[resolve->current_id % QUERIES_MAX])
|
|
resolve->current_id++;
|
|
|
|
- resolve->current_index %= QUERIES_MAX;
|
|
- }
|
|
-
|
|
- q = resolve->queries[resolve->current_index] = new0(sd_resolve_query, 1);
|
|
+ q = resolve->queries[resolve->current_id % QUERIES_MAX] = new0(sd_resolve_query, 1);
|
|
if (!q)
|
|
return -ENOMEM;
|
|
|
|
resolve->n_queries++;
|
|
|
|
q->resolve = resolve;
|
|
- q->id = resolve->current_id;
|
|
+ q->id = resolve->current_id++;
|
|
|
|
*_q = q;
|
|
return 0;
|