commit_packed_refs(): remove call to `packed_refs_unlock()`

Instead, change the callers of `commit_packed_refs()` to call
`packed_refs_unlock()`.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 8ea4e9ab0577f2cd2beee9a86639825839e600c8..93bdc8f0c8b4ebe49da19836bb8bfabcc85da96f 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1131,6 +1131,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
 
        if (commit_packed_refs(refs->packed_ref_store, &err))
                die("unable to overwrite old ref-pack file: %s", err.buf);
 
        if (commit_packed_refs(refs->packed_ref_store, &err))
                die("unable to overwrite old ref-pack file: %s", err.buf);

+       packed_refs_unlock(refs->packed_ref_store);

 
        prune_refs(refs, refs_to_prune);
        strbuf_release(&err);
 
        prune_refs(refs, refs_to_prune);
        strbuf_release(&err);


@@ -2699,6 +2700,7 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
        }
 
 cleanup:
        }
 
 cleanup:

+       packed_refs_unlock(refs->packed_ref_store);

        transaction->state = REF_TRANSACTION_CLOSED;
        string_list_clear(&affected_refnames, 0);
        return ret;
        transaction->state = REF_TRANSACTION_CLOSED;
        string_list_clear(&affected_refnames, 0);
        return ret;

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 96d92a5eea6063c1a71a29342baf491587b99385..5cf6b3d40ef97aecacf8beb1a62dafe031412eae 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -606,7 +606,6 @@ int commit_packed_refs(struct ref_store *ref_store, struct strbuf *err)
        struct packed_ref_cache *packed_ref_cache =
                get_packed_ref_cache(refs);
        int ok;
        struct packed_ref_cache *packed_ref_cache =
                get_packed_ref_cache(refs);
        int ok;

-       int ret = -1;

        struct strbuf sb = STRBUF_INIT;
        FILE *out;
        struct ref_iterator *iter;
        struct strbuf sb = STRBUF_INIT;
        FILE *out;
        struct ref_iterator *iter;


@@ -619,7 +618,7 @@ int commit_packed_refs(struct ref_store *ref_store, struct strbuf *err)
                strbuf_addf(err, "unable to create file %s: %s",
                            sb.buf, strerror(errno));
                strbuf_release(&sb);
                strbuf_addf(err, "unable to create file %s: %s",
                            sb.buf, strerror(errno));
                strbuf_release(&sb);

-               goto out;
+               return -1;

        }
        strbuf_release(&sb);
 
        }
        strbuf_release(&sb);
 


@@ -660,18 +659,14 @@ int commit_packed_refs(struct ref_store *ref_store, struct strbuf *err)
        if (rename_tempfile(&refs->tempfile, refs->path)) {
                strbuf_addf(err, "error replacing %s: %s",
                            refs->path, strerror(errno));
        if (rename_tempfile(&refs->tempfile, refs->path)) {
                strbuf_addf(err, "error replacing %s: %s",
                            refs->path, strerror(errno));

-               goto out;
+               return -1;

        }
 
        }
 

-       ret = 0;
-       goto out;
+       return 0;

 
 error:
        delete_tempfile(&refs->tempfile);
 
 error:
        delete_tempfile(&refs->tempfile);

-
-out:
-       packed_refs_unlock(ref_store);
-       return ret;
+       return -1;

 }
 
 /*
 }
 
 /*


@@ -705,6 +700,7 @@ int repack_without_refs(struct ref_store *ref_store,
        struct ref_dir *packed;
        struct string_list_item *refname;
        int needs_repacking = 0, removed = 0;
        struct ref_dir *packed;
        struct string_list_item *refname;
        int needs_repacking = 0, removed = 0;

+       int ret;

 
        packed_assert_main_repository(refs, "repack_without_refs");
        assert(err);
 
        packed_assert_main_repository(refs, "repack_without_refs");
        assert(err);


@@ -740,7 +736,9 @@ int repack_without_refs(struct ref_store *ref_store,
        }
 
        /* Write what remains */
        }
 
        /* Write what remains */

-       return commit_packed_refs(&refs->base, err);
+       ret = commit_packed_refs(&refs->base, err);
+       packed_refs_unlock(ref_store);
+       return ret;

 }
 
 static int packed_init_db(struct ref_store *ref_store, struct strbuf *err)
 }
 
 static int packed_init_db(struct ref_store *ref_store, struct strbuf *err)