search for: 0f84f12

...s in commit 086a1ceaeb8da4c67787c31580548f7a607b7a7c and commit f649b53c037681e897471aa438758a07f067d624. Thanks: Martin Kletzander --- filters/error/error.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/filters/error/error.c b/filters/error/error.c index bf7b442..0f84f12 100644 --- a/filters/error/error.c +++ b/filters/error/error.c @@ -213,27 +213,27 @@ error_config (nbdkit_next_config *next, void *nxdata, extents_settings.file = nbdkit_absolute_path (value); return 0; } - else if (strcmp (key, "error-pread-rate") == 0) { + else if (strcmp...

...void *nxdata, void *handle, { int r; - pthread_mutex_lock (&lock); + ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&lock); r = blk_flush (); if (r == -1) *err = errno; - pthread_mutex_unlock (&lock); return r; } diff --git a/filters/error/error.c b/filters/error/error.c index 0f84f12..22ebd1c 100644 --- a/filters/error/error.c +++ b/filters/error/error.c @@ -283,9 +283,10 @@ random_error (const struct error_settings *error_settings, * representable in a 64 bit integer, and because we don't need all * this precision anyway, let's work in 32 bits. */ - pthrea...

I do have a question about whether patch 2 is right, or whether I've exposed a bigger problem in the truncate (and possibly other) filter, but the rest seem fairly straightforward. Eric Blake (4): server: Check for pthread lock failures truncate: Factor out reading real_size under mutex plugins: Check for mutex failures filters: Check for mutex failures filters/cache/cache.c