X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=pack-objects.h;h=6bfacc7d2cedd7f399d7807b7746b6ed66737eed;hb=0b5dc59c6b5bea37a425f84e64cd33cd0694a46d;hp=3cd8d1f00a95978a5a8c86805506b9927aefcd0e;hpb=ec27a940134e940a68228401e54f89d610858a26;p=thirdparty%2Fgit.git

diff --git a/pack-objects.h b/pack-objects.h
index 3cd8d1f00a..6bfacc7d2c 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -148,7 +148,11 @@ struct packing_data {
 	struct packed_git **in_pack_by_idx;
 	struct packed_git **in_pack;
 
-	pthread_mutex_t lock;
+	/*
+	 * During packing with multiple threads, protect the in-core
+	 * object database from concurrent accesses.
+	 */
+	pthread_mutex_t odb_lock;
 
 	/*
 	 * This list contains entries for bases which we know the other side
@@ -168,13 +172,14 @@ struct packing_data {
 
 void prepare_packing_data(struct repository *r, struct packing_data *pdata);
 
+/* Protect access to object database */
 static inline void packing_data_lock(struct packing_data *pdata)
 {
-	pthread_mutex_lock(&pdata->lock);
+	pthread_mutex_lock(&pdata->odb_lock);
 }
 static inline void packing_data_unlock(struct packing_data *pdata)
 {
-	pthread_mutex_unlock(&pdata->lock);
+	pthread_mutex_unlock(&pdata->odb_lock);
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,