Browse Source

discard_cache(): discard index, even if no file was mmap()ed

Since add_cacheinfo() can be called without a mapped index file,
discard_cache() _has_ to discard the entries, even when
cache_mmap == NULL.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Johannes Schindelin 19 years ago committed by Junio C Hamano
parent
commit
4147d801db
  1. 6
      read-cache.c

6
read-cache.c

@ -840,14 +840,14 @@ int discard_cache() @@ -840,14 +840,14 @@ int discard_cache()
{
int ret;

active_nr = active_cache_changed = 0;
index_file_timestamp = 0;
cache_tree_free(&active_cache_tree);
if (cache_mmap == NULL)
return 0;
ret = munmap(cache_mmap, cache_mmap_size);
cache_mmap = NULL;
cache_mmap_size = 0;
active_nr = active_cache_changed = 0;
index_file_timestamp = 0;
cache_tree_free(&active_cache_tree);

/* no need to throw away allocated active_cache */
return ret;

Loading…
Cancel
Save