diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2019-02-24 23:59:26 +1300 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2019-02-25 00:02:56 +1300 |
| commit | ede6b19624d1836635d8bd2c8cdc6a694d8ff678 (patch) | |
| tree | 0efca46d3c6ddda4a683d0a130501dfddf818035 | |
| parent | 99a1554a2680d25f0b54d4209ccfc76c443df6e3 (diff) | |
Tolerate EINVAL when calling fsync() on a directory.
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
| -rw-r--r-- | src/backend/storage/file/fd.c | 2 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index df13a3e367c..1fa83274fb3 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -2944,7 +2944,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/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 1d4546eeafb..2948e73af0e 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -696,7 +696,7 @@ fsync_fname_ext(const char *fname, bool isdir) * 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)); |