summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/storage/file/fd.c15
-rw-r--r--src/bin/initdb/initdb.c12
2 files changed, 3 insertions, 24 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 487188a791a..197d7d8707a 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2647,18 +2647,15 @@ pre_sync_fname(const char *fname, bool isdir, int elevel)
{
if (errno == EACCES || (isdir && errno == EISDIR))
return;
-
-#ifdef ETXTBSY
- if (errno == ETXTBSY)
- return;
-#endif
-
ereport(elevel,
(errcode_for_file_access(),
errmsg("could not open file \"%s\": %m", fname)));
return;
}
+ /*
+ * We ignore errors from pg_flush_data() because this is only a hint.
+ */
(void) pg_flush_data(fd, 0, 0);
(void) CloseTransientFile(fd);
@@ -2702,12 +2699,6 @@ fsync_fname_ext(const char *fname, bool isdir, int elevel)
{
if (errno == EACCES || (isdir && errno == EISDIR))
return;
-
-#ifdef ETXTBSY
- if (errno == ETXTBSY)
- return;
-#endif
-
ereport(elevel,
(errcode_for_file_access(),
errmsg("could not open file \"%s\": %m", fname)));
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 21f628f83d0..57f5f89dd94 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -627,12 +627,6 @@ pre_sync_fname(const char *fname, bool isdir)
{
if (errno == EACCES || (isdir && errno == EISDIR))
return;
-
-#ifdef ETXTBSY
- if (errno == ETXTBSY)
- return;
-#endif
-
fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
progname, fname, strerror(errno));
return;
@@ -692,12 +686,6 @@ fsync_fname_ext(const char *fname, bool isdir)
{
if (errno == EACCES || (isdir && errno == EISDIR))
return;
-
-#ifdef ETXTBSY
- if (errno == ETXTBSY)
- return;
-#endif
-
fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
progname, fname, strerror(errno));
return;