Tolerate EINVAL when calling fsync() on a directory.

macdice · macdice · commit bcf627834344 · 2019-02-24T23:52:20.000+13:00
Previously, we tolerated EBADF as a way for the operating system to indicate that it doesn't support fsync() on a directory. Tolerate EINVAL too, for older versions of Linux CIFS. Bug #15636. Back-patch all the way. Reported-by: John Klann Discussion: https://postgr.es/m/15636-d380890dafd78fc6@postgresql.org
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -3225,7 +3225,7 @@ fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel)
 	 * Some OSes don't allow us to fsync directories at all, so we can ignore
 	 * those errors. Anything else needs to be logged.
 	 */
-	if (returncode != 0 && !(isdir && errno == EBADF))
+	if (returncode != 0 && !(isdir && (errno == EBADF || errno == EINVAL)))
 	{
 		int			save_errno;
 
diff --git a/src/common/file_utils.c b/src/common/file_utils.c
@@ -299,7 +299,7 @@ fsync_fname(const char *fname, bool isdir, const char *progname)
 	 * Some OSes don't allow us to fsync directories at all, so we can ignore
 	 * those errors. Anything else needs to be reported.
 	 */
-	if (returncode != 0 && !(isdir && errno == EBADF))
+	if (returncode != 0 && !(isdir && (errno == EBADF || errno == EINVAL)))
 	{
 		fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"),
 				progname, fname, strerror(errno));

Original file line number	Diff line number	Diff line change
`@@ -3225,7 +3225,7 @@ fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel)`
`3225`	`3225`	`* Some OSes don't allow us to fsync directories at all, so we can ignore`
`3226`	`3226`	`* those errors. Anything else needs to be logged.`
`3227`	`3227`	`*/`
`3228`		`- if (returncode != 0 && !(isdir && errno == EBADF))`
	`3228`	`+ if (returncode != 0 && !(isdir && (errno == EBADF \|\| errno == EINVAL)))`
`3229`	`3229`	`{`
`3230`	`3230`	`int save_errno;`
`3231`	`3231`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ fsync_fname(const char fname, bool isdir, const char progname)`
`299`	`299`	`* Some OSes don't allow us to fsync directories at all, so we can ignore`
`300`	`300`	`* those errors. Anything else needs to be reported.`
`301`	`301`	`*/`
`302`		`- if (returncode != 0 && !(isdir && errno == EBADF))`
	`302`	`+ if (returncode != 0 && !(isdir && (errno == EBADF \|\| errno == EINVAL)))`
`303`	`303`	`{`
`304`	`304`	`fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"),`
`305`	`305`	`progname, fname, strerror(errno));`