Use xmmap_gently instead of xmmap in use_pack
authorMike Hommey <mh@glandium.org>
Thu, 16 May 2019 00:37:36 +0000 (09:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 May 2019 09:02:30 +0000 (18:02 +0900)
use_pack has its own error message on mmap error, but it can't be
reached when using xmmap, which dies with its own error.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
packfile.c
index 16bcb75262d918fc7b88cc5141213e951be145cc..6a66b605e90f27c2e58949d4fe218ddafd1fbd01 100644 (file)
@@ -630,7 +630,7 @@ unsigned char *use_pack(struct packed_git *p,
                        while (packed_git_limit < pack_mapped
                                && unuse_one_window(p))
                                ; /* nothing */
-                       win->base = xmmap(NULL, win->len,
+                       win->base = xmmap_gently(NULL, win->len,
                                PROT_READ, MAP_PRIVATE,
                                p->pack_fd, win->offset);
                        if (win->base == MAP_FAILED)