From 21ac03cb1b72b8d2195028653f4a085d44e09de0 Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Tue, 30 Dec 2025 00:32:57 -0600
Subject: [PATCH] Dropped LFS3_YES_* variants of traversal/gc flags

Previously these only implied M/F flags, which risks quite a bit of
confusion. It's entirely reasonable to expect these to affect lfs3_fs_gc
(arguably the more correct behavior?) but they did not.

Maybe these should imply the GC behavior, or maybe we should rename them
to LFS3_YES_GC_*/LFS3_YES_M_*/etc, but at the very least the current
behavior of implying M/F is probably not a good idea.

So, removing for now. This is the safest option, and better thought-out
behavior can be added in the future.
---
 lfs3.c      | 36 ------------------------------------
 lfs3_util.h | 11 -----------
 2 files changed, 47 deletions(-)

diff --git a/lfs3.c b/lfs3.c
index f8963338..b2cc497b 100644
--- a/lfs3.c
+++ b/lfs3.c
@@ -15934,24 +15934,6 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags,
     #ifdef LFS3_YES_CKDATACKSUMS
     flags |= LFS3_M_CKDATACKSUMS;
     #endif
-    #ifdef LFS3_YES_MKCONSISTENT
-    flags |= LFS3_M_MKCONSISTENT;
-    #endif
-    #ifdef LFS3_YES_LOOKAHEAD
-    flags |= LFS3_M_LOOKAHEAD;
-    #endif
-    #ifdef LFS3_YES_PREERASE
-    flags |= LFS3_M_PREERASE;
-    #endif
-    #ifdef LFS3_YES_COMPACT
-    flags |= LFS3_M_COMPACT;
-    #endif
-    #ifdef LFS3_YES_CKMETA
-    flags |= LFS3_M_CKMETA;
-    #endif
-    #ifdef LFS3_YES_CKDATA
-    flags |= LFS3_M_CKDATA
-    #endif
 
     // unknown flags?
     LFS3_ASSERT((flags & ~(
@@ -16253,24 +16235,6 @@ int lfs3_format(lfs3_t *lfs3, uint32_t flags,
     #ifdef LFS3_YES_CKDATACKSUMS
     flags |= LFS3_F_CKDATACKSUMS;
     #endif
-    #ifdef LFS3_YES_MKCONSISTENT
-    flags |= LFS3_F_MKCONSISTENT;
-    #endif
-    #ifdef LFS3_YES_LOOKAHEAD
-    flags |= LFS3_F_LOOKAHEAD;
-    #endif
-    #ifdef LFS3_YES_PREERASE
-    flags |= LFS3_F_PREERASE;
-    #endif
-    #ifdef LFS3_YES_COMPACT
-    flags |= LFS3_F_COMPACT;
-    #endif
-    #ifdef LFS3_YES_CKMETA
-    flags |= LFS3_F_CKMETA;
-    #endif
-    #ifdef LFS3_YES_CKDATA
-    flags |= LFS3_F_CKDATA;
-    #endif
 
     // unknown flags?
     LFS3_ASSERT((flags & ~(
diff --git a/lfs3_util.h b/lfs3_util.h
index b0c7f431..7ab65390 100644
--- a/lfs3_util.h
+++ b/lfs3_util.h
@@ -86,9 +86,6 @@
 #ifdef LFS3_YES_GBMAP
 #define LFS3_GBMAP
 #endif
-#ifdef LFS3_YES_PREERASE
-#define LFS3_PREERASE
-#endif
 #ifdef LFS3_YES_BLEAFCACHE
 #define LFS3_BLEAFCACHE
 #endif
@@ -331,14 +328,6 @@
 #define LFS3_IFDEF_PREERASE(a, b) (b)
 #endif
 
-#if defined(LFS3_PREERASE) && defined(LFS3_YES_PREERASE)
-#define LFS3_IFYES_PREERASE(a, b, c) (a)
-#elif defined(LFS3_PREERASE)
-#define LFS3_IFYES_PREERASE(a, b, c) (b)
-#else
-#define LFS3_IFYES_PREERASE(a, b, c) (c)
-#endif
-
 #ifdef LFS3_BLEAFCACHE
 #define LFS3_IFDEF_BLEAFCACHE(a, b) (a)
 #else