diff options
| author | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
| commit | 0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546 (patch) | |
| tree | 1d545d99bb6eac2e377e894a275770afff9b1a3d /src/os_unix.c | |
| parent | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (diff) | |
| parent | 0539702b8e9a54b2c8cbc28db6666570700fc1c8 (diff) | |
| download | sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.tar.gz sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.zip | |
Merge enhancements from trunk.
FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 81422f215..fe1fc6af1 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5887,12 +5887,7 @@ static int unixDelete( int fd; rc = osOpenDirectory(zPath, &fd); if( rc==SQLITE_OK ){ -#if OS_VXWORKS - if( fsync(fd)==-1 ) -#else - if( fsync(fd) ) -#endif - { + if( full_fsync(fd,0,0) ){ rc = unixLogError(SQLITE_IOERR_DIR_FSYNC, "fsync", zPath); } robust_close(0, fd, __LINE__); @@ -6936,7 +6931,7 @@ static int proxyTakeConch(unixFile *pFile){ writeSize = PROXY_PATHINDEX + strlen(&writeBuffer[PROXY_PATHINDEX]); robust_ftruncate(conchFile->h, writeSize); rc = unixWrite((sqlite3_file *)conchFile, writeBuffer, writeSize, 0); - fsync(conchFile->h); + full_fsync(conchFile->h,0,0); /* If we created a new conch file (not just updated the contents of a ** valid conch file), try to match the permissions of the database */ |