diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2019-02-24 23:48:52 +1300 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2019-02-24 23:52:20 +1300 |
| commit | bcf6278343444aa1de93b7c131b30c608a5b6e45 (patch) | |
| tree | 2acefa7ff2b9547465fba4138349a6906e54cd08 | |
| parent | 387483e89b2851247e091013bfdbfd1c448cb7df (diff) | |
| download | postgresql-bcf6278343444aa1de93b7c131b30c608a5b6e45.tar.gz postgresql-bcf6278343444aa1de93b7c131b30c608a5b6e45.zip | |
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/common/file_utils.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 96fe1827b20..19d4e204151 100644 --- 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 index 4304058acb2..5f934a14c11 100644 --- 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)); |