From 280738c36ebd19076902796cb07950efc749d89b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 26 Dec 2019 10:42:19 +0000 Subject: [PATCH 1/2] packfile: remove redundant fcntl F_GETFD/F_SETFD git_open sets close-on-exec since cd66ada06588f797 ("sha1_file: open window into packfiles with O_CLOEXEC"). There's no reason to keep using fcntl to set the close-on-exec flag, anymore. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- packfile.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packfile.c b/packfile.c index c0d83fdfed..518d9d5b54 100644 --- a/packfile.c +++ b/packfile.c @@ -489,7 +489,6 @@ static int open_packed_git_1(struct packed_git *p) struct pack_header hdr; unsigned char hash[GIT_MAX_RAWSZ]; unsigned char *idx_hash; - long fd_flag; ssize_t read_result; const unsigned hashsz = the_hash_algo->rawsz; @@ -533,16 +532,6 @@ static int open_packed_git_1(struct packed_git *p) } else if (p->pack_size != st.st_size) return error("packfile %s size changed", p->pack_name); - /* We leave these file descriptors open with sliding mmap; - * there is no point keeping them open across exec(), though. - */ - fd_flag = fcntl(p->pack_fd, F_GETFD, 0); - if (fd_flag < 0) - return error("cannot determine file descriptor flags"); - fd_flag |= FD_CLOEXEC; - if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1) - return error("cannot set FD_CLOEXEC"); - /* Verify we recognize this pack file format. */ read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr)); if (read_result < 0) From 4e61b2214d333a47ec56eb0806be1774f7ac1b7d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 26 Dec 2019 10:42:20 +0000 Subject: [PATCH 2/2] packfile: replace lseek+read with pread We already have pread emulation for portability, so there's there's no reason to make two syscalls where one suffices. Furthermore, readers of the packfile will be using mmap (or pread to emulate mmap), anyways, so the file description offset does not matter in this case. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- packfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packfile.c b/packfile.c index 518d9d5b54..fdb33fda81 100644 --- a/packfile.c +++ b/packfile.c @@ -555,9 +555,8 @@ static int open_packed_git_1(struct packed_git *p) " while index indicates %"PRIu32" objects", p->pack_name, ntohl(hdr.hdr_entries), p->num_objects); - if (lseek(p->pack_fd, p->pack_size - hashsz, SEEK_SET) == -1) - return error("end of packfile %s is unavailable", p->pack_name); - read_result = read_in_full(p->pack_fd, hash, hashsz); + read_result = pread_in_full(p->pack_fd, hash, hashsz, + p->pack_size - hashsz); if (read_result < 0) return error_errno("error reading from %s", p->pack_name); if (read_result != hashsz)