Extract a struct stat_data from cache_entry

diff --git a/refs.c b/refs.c
index 80c172f469c4121bc0a72adb8ed47d083a36036e..a5a5b5d3bd7bbc9803877a78235e2a9bde7209f6 100644 (file)
--- 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;
 };
@@ -1590,10 +1592,12 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
 static int do_for_each_entry(struct ref_cache *refs, const char *base,
                             each_ref_entry_fn fn, void *cb_data)
 {
-       struct ref_dir *packed_dir = get_packed_refs(refs);
+       struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
+       struct ref_dir *packed_dir = get_packed_ref_dir(packed_ref_cache);
        struct ref_dir *loose_dir = get_loose_refs(refs);
        int retval = 0;
 
+       acquire_packed_ref_cache(packed_ref_cache);
        if (base && *base) {
                packed_dir = find_containing_dir(packed_dir, base, 0);
                loose_dir = find_containing_dir(loose_dir, base, 0);
@@ -1614,6 +1618,7 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,
                                loose_dir, 0, fn, cb_data);
        }
 
+       release_packed_ref_cache(packed_ref_cache);
        return retval;
 }
 
@@ -2096,6 +2101,8 @@ int lock_packed_refs(int flags)
        /* Read the current packed-refs while holding the lock: */
        packed_ref_cache = get_packed_ref_cache(&ref_cache);
        packed_ref_cache->lock = &packlock;
+       /* Increment the reference count to prevent it from being freed: */
+       acquire_packed_ref_cache(packed_ref_cache);
        return 0;
 }
 
@@ -2116,6 +2123,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 +2136,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);
 }