Merge branch 'ot/mru-on-list' into next

diff --git a/packfile.c b/packfile.c
index 234797cde78b0103f327000204c69a5fa99c0be3..f4dc4a242bdf8eb4e063adfdd56eb921c11ef5c0 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -45,7 +45,7 @@ static unsigned int pack_max_fds;
 static size_t peak_pack_mapped;
 static size_t pack_mapped;
 struct packed_git *packed_git;
-struct mru packed_git_mru;
+struct mru packed_git_mru = {{&packed_git_mru.list, &packed_git_mru.list}};
 
 #define SZ_FMT PRIuMAX
 static inline uintmax_t sz_fmt(size_t s) { return s; }
@@ -1841,13 +1841,14 @@ static int fill_pack_entry(const unsigned char *sha1,
  */
 int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 {
-       struct mru_entry *p;
+       struct list_head *pos;
 
        prepare_packed_git();
        if (!packed_git)
                return 0;
 
-       for (p = packed_git_mru.head; p; p = p->next) {
+       list_for_each(pos, &packed_git_mru.list) {
+               struct mru *p = list_entry(pos, struct mru, list);
                if (fill_pack_entry(sha1, e, p->item)) {
                        mru_mark(&packed_git_mru, p);
                        return 1;