From e5fe2796325f7017f74827c0cb52a2b2ee3b370f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= <leo@yuriev.ru>
Date: Sun, 12 Jan 2025 14:30:39 +0300
Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B8=20lck-=D1=84=D0=B0=D0=B9=D0=BB=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lck.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/lck.c b/src/lck.c
index 3b8b4a6e..097aeb69 100644
--- a/src/lck.c
+++ b/src/lck.c
@@ -133,28 +133,33 @@ __cold int lck_setup(MDBX_env *env, mdbx_mode_t mode) {
   int err = osal_openfile(MDBX_OPEN_LCK, env, env->pathname.lck, &env->lck_mmap.fd, mode);
   if (err != MDBX_SUCCESS) {
     switch (err) {
-    default:
-      return err;
     case MDBX_EACCESS:
     case MDBX_EPERM:
-      if (!F_ISSET(env->flags, MDBX_RDONLY | MDBX_EXCLUSIVE))
-        return err;
-      break;
+      if (F_ISSET(env->flags, MDBX_RDONLY | MDBX_EXCLUSIVE))
+        break;
+      __fallthrough /* fall through */;
     case MDBX_ENOFILE:
     case MDBX_EROFS:
-      if ((env->flags & MDBX_RDONLY) == 0)
-        return err;
-      /* ENSURE the file system is read-only */
-      err = osal_check_fs_rdonly(env->lazy_fd, env->pathname.lck, err);
-      if (err != MDBX_SUCCESS &&
-          /* ignore ERROR_NOT_SUPPORTED for exclusive mode */
-          !(err == MDBX_ENOSYS && (env->flags & MDBX_EXCLUSIVE)))
-        return err;
-      break;
+      if (env->flags & MDBX_RDONLY) {
+        /* ENSURE the file system is read-only */
+        int err_rofs = osal_check_fs_rdonly(env->lazy_fd, env->pathname.lck, err);
+        if (err_rofs == MDBX_SUCCESS ||
+            /* ignore ERROR_NOT_SUPPORTED for exclusive mode */
+            (err_rofs == MDBX_ENOSYS && (env->flags & MDBX_EXCLUSIVE)))
+          break;
+        if (err_rofs != MDBX_ENOSYS)
+          err = err_rofs;
+      }
+      __fallthrough /* fall through */;
+    default:
+      ERROR("unable to open lck-file %" MDBX_PRIsPATH ", env-flags 0x%X, err %d", env->pathname.lck, env->flags, err);
+      return err;
     }
 
     /* LY: without-lck mode (e.g. exclusive or on read-only filesystem) */
     env->lck_mmap.fd = INVALID_HANDLE_VALUE;
+    NOTICE("continue %" MDBX_PRIsPATH " within without-lck mode, env-flags 0x%X, lck-error %d", env->pathname.dxb,
+           env->flags, err);
   }
 
   rthc_lock();