From 459307b139c9a859ca0b6ca5276cf9be3d2b8e3e Mon Sep 17 00:00:00 2001 From: Patrick Hogg Date: Thu, 24 Jan 2019 19:22:03 -0500 Subject: pack-objects: move read mutex to packing_data struct ac77d0c37 ("pack-objects: shrink size field in struct object_entry", 2018-04-14) added an extra usage of read_lock/read_unlock in the newly introduced oe_get_size_slow for thread safety in parallel calls to try_delta(). Unfortunately oe_get_size_slow is also used in serial code, some of which is called before the first invocation of ll_find_deltas. As such the read mutex is not guaranteed to be initialized. Resolve this by moving the read mutex to packing_data and initializing it in prepare_packing_data which is initialized in cmd_pack_objects. Signed-off-by: Patrick Hogg Reviewed-by: Duy Nguyen Signed-off-by: Junio C Hamano --- pack-objects.c | 1 + 1 file changed, 1 insertion(+) (limited to 'pack-objects.c') diff --git a/pack-objects.c b/pack-objects.c index b6cdbb0166..3554c43ac2 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -150,6 +150,7 @@ void prepare_packing_data(struct packing_data *pdata) 1UL << OE_DELTA_SIZE_BITS); #ifndef NO_PTHREADS pthread_mutex_init(&pdata->lock, NULL); + init_recursive_mutex(&pdata->read_lock); #endif } -- cgit v1.2.3