Merge branch 'vn/xmmap-gently' into maint

Clean-up an error codepath.

* vn/xmmap-gently:
read-cache.c: do not die if mmap fails

diff --combined read-cache.c
index 32816763bd6dbe3d5e1784b3a39bb8c431ec82f9,4e30dafa9dfa26a027a665e7e1509f6437ec79de..7b1be1b6712cdd09f4c341c9d75cfd0ed6c3aa37
--- 1/read-cache.c
--- 2/read-cache.c
+++ b/read-cache.c
@@@ -195,7 -195,7 +195,7 @@@ int match_stat_data(const struct stat_d
   * cache, ie the parts that aren't tracked by GIT, and only used
   * to validate the cache.
   */
 -void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 +void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
  {
        fill_stat_data(&ce->ce_stat_data, st);
  
@@@ -204,7 -204,7 +204,7 @@@
  
        if (S_ISREG(st->st_mode)) {
                ce_mark_uptodate(ce);
 -              mark_fsmonitor_valid(ce);
 +              mark_fsmonitor_valid(istate, ce);
        }
  }
  
@@@ -728,7 -728,7 +728,7 @@@ int add_to_index(struct index_state *is
        memcpy(ce->name, path, namelen);
        ce->ce_namelen = namelen;
        if (!intent_only)
 -              fill_stat_cache_info(ce, st);
 +              fill_stat_cache_info(istate, ce, st);
        else
                ce->ce_flags |= CE_INTENT_TO_ADD;
  
@@@ -1432,7 -1432,7 +1432,7 @@@ static struct cache_entry *refresh_cach
                         */
                        if (!S_ISGITLINK(ce->ce_mode)) {
                                ce_mark_uptodate(ce);
 -                              mark_fsmonitor_valid(ce);
 +                              mark_fsmonitor_valid(istate, ce);
                        }
                        return ce;
                }
@@@ -1447,7 -1447,7 +1447,7 @@@
        updated = make_empty_cache_entry(istate, ce_namelen(ce));
        copy_cache_entry(updated, ce);
        memcpy(updated->name, ce->name, ce->ce_namelen + 1);
 -      fill_stat_cache_info(updated, &st);
 +      fill_stat_cache_info(istate, updated, &st);
        /*
         * If ignore_valid is not set, we should leave CE_VALID bit
         * alone.  Otherwise, paths marked with --no-assume-unchanged
@@@ -2140,7 -2140,7 +2140,7 @@@ int do_read_index(struct index_state *i
        if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
                die(_("%s: index file smaller than expected"), path);
  
-       mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
+       mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (mmap == MAP_FAILED)
                die_errno(_("%s: unable to map index file"), path);
        close(fd);