summaryrefslogtreecommitdiffstats
path: root/third_party/leveldatabase/env_chromium.cc
diff options
context:
space:
mode:
authorrmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 14:11:58 +0000
committerrmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 14:11:58 +0000
commita23e51a3473d0366fa93fdf9e72ba6ed6fa9d466 (patch)
treea72ecf73dbba00fa0f5ff6d77fca4576a3f7bf05 /third_party/leveldatabase/env_chromium.cc
parentce046700be157bdaa98493806290700c2e2314b4 (diff)
downloadchromium_src-a23e51a3473d0366fa93fdf9e72ba6ed6fa9d466.zip
chromium_src-a23e51a3473d0366fa93fdf9e72ba6ed6fa9d466.tar.gz
chromium_src-a23e51a3473d0366fa93fdf9e72ba6ed6fa9d466.tar.bz2
Revert "Do fcntl(...F_FULLFSYNC...) on mac instead of fsync"
This reverts commit r221413. Original CL: https://src.chromium.org/viewvc/chrome?revision=221413&view=revision BUG=286266 NOTRY=true TBR=dgrogan@chromium.org Review URL: https://chromiumcodereview.appspot.com/23538008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/leveldatabase/env_chromium.cc')
-rw-r--r--third_party/leveldatabase/env_chromium.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index 413f230..97f6c8e 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -68,8 +68,6 @@ int fflush_wrapper(FILE *file) {
int fdatasync(int fildes) {
#if defined(OS_WIN)
return _commit(fildes);
-#elif defined(OS_MACOSX)
- return HANDLE_EINTR(fcntl(fildes, F_FULLFSYNC, 0));
#else
return HANDLE_EINTR(fsync(fildes));
#endif
@@ -517,7 +515,7 @@ Status ChromiumWritableFile::Sync() {
error = errno;
// Sync even if fflush gave an error; perhaps the data actually got out,
// even though something went wrong.
- if (fdatasync(fileno(file_)) == -1 && !error)
+ if (fdatasync(fileno(file_)) && !error)
error = errno;
// Report the first error we found.
if (error) {