From b0a48e996bd7ff336ea26344d3d97ad32b22a61a Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 15 Nov 2014 01:09:05 +0100 Subject: Backport "Expose fsync_fname as a public API". Backport commit cc52d5b33ff5df29de57dcae9322214cfe9c8464 back to 9.1 to allow backpatching some unlogged table fixes that use fsync_fname. --- src/backend/storage/file/copydir.c | 59 -------------------------------------- 1 file changed, 59 deletions(-) (limited to 'src/backend/storage/file/copydir.c') diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c index 6cfb8164f69..51e29662ac7 100644 --- a/src/backend/storage/file/copydir.c +++ b/src/backend/storage/file/copydir.c @@ -38,9 +38,6 @@ #endif -static void fsync_fname(char *fname, bool isdir); - - /* * copydir: copy a directory * @@ -214,59 +211,3 @@ copy_file(char *fromfile, char *tofile) pfree(buffer); } - - -/* - * fsync a file - * - * Try to fsync directories but ignore errors that indicate the OS - * just doesn't allow/require fsyncing directories. - */ -static void -fsync_fname(char *fname, bool isdir) -{ - int fd; - int returncode; - - /* - * Some OSs require directories to be opened read-only whereas other - * systems don't allow us to fsync files opened read-only; so we need both - * cases here - */ - if (!isdir) - fd = BasicOpenFile(fname, - O_RDWR | PG_BINARY, - S_IRUSR | S_IWUSR); - else - fd = BasicOpenFile(fname, - O_RDONLY | PG_BINARY, - S_IRUSR | S_IWUSR); - - /* - * Some OSs don't allow us to open directories at all (Windows returns - * EACCES) - */ - if (fd < 0 && isdir && (errno == EISDIR || errno == EACCES)) - return; - - else if (fd < 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not open file \"%s\": %m", fname))); - - returncode = pg_fsync(fd); - - /* Some OSs don't allow us to fsync directories at all */ - if (returncode != 0 && isdir && errno == EBADF) - { - close(fd); - return; - } - - if (returncode != 0) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not fsync file \"%s\": %m", fname))); - - close(fd); -} -- cgit v1.2.3