From: kero Date: Thu, 9 Jan 2025 14:56:00 +0000 (+0000) Subject: ITS#10296 lmdb: fix fdatasync on MacOS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b3c3d407862502d65f3acffa5587a3a07dac57;p=thirdparty%2Fopenldap.git ITS#10296 lmdb: fix fdatasync on MacOS Patch from kero, with corrections by hyc --- diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 668f9660f2..25307144ed 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -128,7 +128,11 @@ typedef SSIZE_T ssize_t; # define MDB_USE_ROBUST 1 #elif defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) # define MDB_USE_POSIX_SEM 1 -# define MDB_FDATASYNC fsync +# if defined(__APPLE__) +# define MDB_FDATASYNC fcntl(fd, F_FULLSYNC) +# else +# define MDB_FDATASYNC fsync +# endif #elif defined(ANDROID) # define MDB_FDATASYNC fsync #endif @@ -2573,7 +2577,7 @@ mdb_env_sync(MDB_env *env, int force) ? MS_ASYNC : MS_SYNC; if (MDB_MSYNC(env->me_map, env->me_mapsize, flags)) rc = ErrCode(); -#ifdef _WIN32 +#if defined(_WIN32) || defined(__APPLE__) else if (flags == MS_SYNC && MDB_FDATASYNC(env->me_fd)) rc = ErrCode(); #endif