upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak conditionals for fdatasync hack

Browse source
This commit is contained in:
Howard Chu 2015-01-11 11:41:08 +00:00
parent 0b9f42d1f4
commit e85c944a3a
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/liblmdb/Makefile
View file

@ -11,6 +11,7 @@
# - MDB_USE_POSIX_SEM # - MDB_USE_POSIX_SEM
# - MDB_DSYNC # - MDB_DSYNC
# - MDB_FDATASYNC # - MDB_FDATASYNC
# - MDB_FDATASYNC_WORKS
# - MDB_USE_PWRITEV # - MDB_USE_PWRITEV
# #
# There may be other macros in mdb.c of interest. You should # There may be other macros in mdb.c of interest. You should

14
libraries/liblmdb/mdb.c
View file

@ -79,6 +79,12 @@ extern int cacheflush(char *addr, int nbytes, int cache);
#define CACHEFLUSH(addr, bytes, cache) #define CACHEFLUSH(addr, bytes, cache)
#endif #endif
#if defined(__linux) && !defined(MDB_FDATASYNC_WORKS)
/** fdatasync is broken on ext3/ext4fs on older kernels, see
* description in #mdb_env_open2 comments
*/
#define BROKEN_FDATASYNC
#endif
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -1143,7 +1149,7 @@ struct MDB_env {
sem_t *me_rmutex; /* Shared mutexes are not supported */ sem_t *me_rmutex; /* Shared mutexes are not supported */
sem_t *me_wmutex; sem_t *me_wmutex;
#endif #endif
#ifdef __linux #ifdef BROKEN_FDATASYMC
int me_fsynconly; /**< fdatasync is unreliable */ int me_fsynconly; /**< fdatasync is unreliable */
#endif #endif
void *me_userctx; /**< User-settable context */ void *me_userctx; /**< User-settable context */
@ -2318,7 +2324,7 @@ mdb_env_sync(MDB_env *env, int force)
rc = ErrCode(); rc = ErrCode();
#endif #endif
} else { } else {
#ifdef __linux #ifdef BROKEN_FDATASYNC
if (env->me_fsynconly) { if (env->me_fsynconly) {
if (fsync(env->me_fd)) if (fsync(env->me_fd))
rc = ErrCode(); rc = ErrCode();
@ -3861,7 +3867,7 @@ mdb_fsize(HANDLE fd, size_t *size)
return MDB_SUCCESS; return MDB_SUCCESS;
} }
#ifdef __linux #ifdef BROKEN_FDATASYNC
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#endif #endif
@ -3883,7 +3889,7 @@ mdb_env_open2(MDB_env *env)
else else
env->me_pidquery = PROCESS_QUERY_INFORMATION; env->me_pidquery = PROCESS_QUERY_INFORMATION;
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef __linux #ifdef BROKEN_FDATASYNC
/* ext3/ext4 fdatasync is broken on some older Linux kernels. /* ext3/ext4 fdatasync is broken on some older Linux kernels.
* https://lkml.org/lkml/2012/9/3/83 * https://lkml.org/lkml/2012/9/3/83
* Kernels after 3.6-rc6 are known good. * Kernels after 3.6-rc6 are known good.