Merge branch 'jc/fsync-can-fail-with-eintr'

gitster · gitster · commit 0481af98ba11 · 2021-06-06T15:39:10.000+09:00
Last minute portability fix.

* jc/fsync-can-fail-with-eintr:
  fsync(): be prepared to see EINTR
diff --git a/write-or-die.c b/write-or-die.c
@@ -57,8 +57,9 @@ void fprintf_or_die(FILE *f, const char *fmt, ...)
 
 void fsync_or_die(int fd, const char *msg)
 {
-	if (fsync(fd) < 0) {
-		die_errno("fsync error on '%s'", msg);
+	while (fsync(fd) < 0) {
+		if (errno != EINTR)
+			die_errno("fsync error on '%s'", msg);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,9 @@ void fprintf_or_die(FILE f, const char fmt, ...)`
`57`	`57`
`58`	`58`	`void fsync_or_die(int fd, const char *msg)`
`59`	`59`	`{`
`60`		`- if (fsync(fd) < 0) {`
`61`		`- die_errno("fsync error on '%s'", msg);`
	`60`	`+ while (fsync(fd) < 0) {`
	`61`	`+ if (errno != EINTR)`
	`62`	`+ die_errno("fsync error on '%s'", msg);`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`