diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:00 -0700 |
| commit | 2496da42118087e6766964c7a7b94f45daf372f4 (patch) | |
| tree | d57760339f184445bc2a036c8eff77ff754479ca /read-cache.c | |
| parent | 21de7e9c50a10ba57d81d05bd1ecd9c4dcb5849c (diff) | |
| parent | bcd2c5eedecf473fa6b15ebda798ce54bb3c75ea (diff) | |
| download | git-2496da42118087e6766964c7a7b94f45daf372f4.tar.gz | |
Merge branch 'rs/parallel-read-cache-fix'
A follow-up fix to a topic already in 'master'.
* rs/parallel-read-cache-fix:
read-cache: fix mem-pool allocation for multi-threaded index loading
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index fa291cdbee..ecf6f68994 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2101,7 +2101,7 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con nr = 0; for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++) nr += p->ieot->entries[j].nr; - istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); + p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); if (istate->version == 4) { mem_pool_init(p->ce_mem_pool, estimate_cache_size_from_compressed(nr)); |
