[PATCH v2 07/12] packed_ref_cache: increment refcount when locked
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:57:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
Increment the packed_ref_cache reference count while it is locked to prevent its being freed. Signed-off-by: Michael Haggerty <redacted> --- refs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index d90f487..6d48b42 100644
--- a/refs.c
+++ b/refs.c@@ -820,7 +820,9 @@ struct packed_ref_cache { /* * Iff the packed-refs file associated with this instance is * currently locked for writing, this points at the associated - * lock (which is owned by somebody else). + * lock (which is owned by somebody else). The referrer count + * is also incremented when the file is locked and decremented + * when it is unlocked. */ struct lock_file *lock; };
@@ -2096,6 +2098,8 @@ int lock_packed_refs(struct lock_file *lock, int flags) /* Read the current packed-refs while holding the lock: */ packed_ref_cache = get_packed_ref_cache(&ref_cache); packed_ref_cache->lock = lock; + /* Increment the reference count to prevent it from being freed: */ + acquire_packed_ref_cache(packed_ref_cache); return 0; }
@@ -2116,6 +2120,7 @@ int commit_packed_refs(void) if (commit_lock_file(packed_ref_cache->lock)) error = -1; packed_ref_cache->lock = NULL; + release_packed_ref_cache(packed_ref_cache); return error; }
@@ -2128,6 +2133,7 @@ void rollback_packed_refs(void) die("internal error: packed-refs not locked"); rollback_lock_file(packed_ref_cache->lock); packed_ref_cache->lock = NULL; + release_packed_ref_cache(packed_ref_cache); clear_packed_ref_cache(&ref_cache); }
--
1.8.3.1