Commit bf3961e3 authored by Howard Chu's avatar Howard Chu
Browse files

More cleanup for fdatasync hack

parent e85c944a
......@@ -81,7 +81,9 @@ extern int cacheflush(char *addr, int nbytes, int cache);
#if defined(__linux) && !defined(MDB_FDATASYNC_WORKS)
/** fdatasync is broken on ext3/ext4fs on older kernels, see
* description in #mdb_env_open2 comments
* description in #mdb_env_open2 comments. You can safely
* define MDB_FDATASYNC_WORKS if this code will only be run
* on kernels 3.6 and newer.
*/
#define BROKEN_FDATASYNC
#endif
......@@ -1102,6 +1104,8 @@ struct MDB_env {
#define MDB_ENV_ACTIVE 0x20000000U
/** me_txkey is set */
#define MDB_ENV_TXKEY 0x10000000U
/** fdatasync is unreliable */
#define MDB_FSYNCONLY 0x08000000U
uint32_t me_flags; /**< @ref mdb_env */
unsigned int me_psize; /**< DB page size, inited from me_os_psize */
unsigned int me_os_psize; /**< OS page size, from #GET_PAGESIZE */
......@@ -1148,9 +1152,6 @@ struct MDB_env {
#elif defined(MDB_USE_POSIX_SEM)
sem_t *me_rmutex; /* Shared mutexes are not supported */
sem_t *me_wmutex;
#endif
#ifdef BROKEN_FDATASYMC
int me_fsynconly; /**< fdatasync is unreliable */
#endif
void *me_userctx; /**< User-settable context */
MDB_assert_func *me_assert_func; /**< Callback for assertion failures */
......@@ -2325,7 +2326,7 @@ mdb_env_sync(MDB_env *env, int force)
#endif
} else {
#ifdef BROKEN_FDATASYNC
if (env->me_fsynconly) {
if (env->me_flags & MDB_FSYNCONLY) {
if (fsync(env->me_fd))
rc = ErrCode();
} else
......@@ -3931,7 +3932,7 @@ mdb_env_open2(MDB_env *env)
} else { /* 4.x and newer is OK */
break;
}
env->me_fsynconly = 1;
env->me_flags |= MDB_FSYNCONLY;
break;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment