diff mbox series

[1/2] packfile: remove redundant fcntl F_GETFD/F_SETFD

Message ID 20191226104220.27325-2-e@80x24.org (mailing list archive)
State New, archived
Headers show
Series packfile: small syscall reductions | expand

Commit Message

Eric Wong Dec. 26, 2019, 10:42 a.m. UTC 
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 <e@80x24.org>
---
 packfile.c | 11 -----------
 1 file changed, 11 deletions(-)
diff mbox series

Patch

diff --git a/packfile.c b/packfile.c
index f0dc63e92f..1821cb7a3d 100644
--- a/packfile.c
+++ b/packfile.c
@@ -510,7 +510,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;
 
@@ -554,16 +553,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)