| Message ID | 20190516003736.25544-2-mh@glandium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] dup() the input fd for fast-import used for remote helpers | expand |
On Thu, May 16, 2019 at 09:37:36AM +0900, Mike Hommey wrote: > 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. Makes sense. Amusingly this xmmap comes from c4712e4553 (Replace mmap with xmmap, better handling MAP_FAILED., 2006-12-24), which specifically moved everything to xmmap for its error handling, and dropped all of the MAP_FAILED checks. But it forgot to remove this one. So we could also go the other way, and just remove the unreachable check. I do think the error from use_pack() is better though, so I like the direction you went. -Peff
diff --git a/packfile.c b/packfile.c index 16bcb75262..6a66b605e9 100644 --- a/packfile.c +++ b/packfile.c @@ -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)
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> --- packfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)