From edb673cf1001eeff140370c41139aaa06e67cea0 Mon Sep 17 00:00:00 2001 From: Patrick Hogg Date: Thu, 24 Jan 2019 19:22:05 -0500 Subject: pack-objects: merge read_lock and lock in packing_data struct Rename the packing_data lock to obd_lock and upgrade it to a recursive mutex to make it suitable for current read_lock usages. Additionally remove the superfluous #ifndef NO_PTHREADS guard around mutex initialization in prepare_packing_data as the mutex functions themselves are already protected. Signed-off-by: Patrick Hogg Helped-by: Junio C Hamano Signed-off-by: Junio C Hamano --- pack-objects.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pack-objects.c') diff --git a/pack-objects.c b/pack-objects.c index 3554c43ac2..a1dc5eb726 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -148,10 +148,7 @@ void prepare_packing_data(struct packing_data *pdata) 1U << OE_SIZE_BITS); pdata->oe_delta_size_limit = git_env_ulong("GIT_TEST_OE_DELTA_SIZE", 1UL << OE_DELTA_SIZE_BITS); -#ifndef NO_PTHREADS - pthread_mutex_init(&pdata->lock, NULL); - init_recursive_mutex(&pdata->read_lock); -#endif + init_recursive_mutex(&pdata->odb_lock); } struct object_entry *packlist_alloc(struct packing_data *pdata, -- cgit v1.3