bcachefs: Kill BTREE_INSERT_NOMARK_INSERT
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 5 Sep 2019 17:37:50 +0000 (13:37 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:26 +0000 (17:08 -0400)
Was dead code

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_update.h
fs/bcachefs/buckets.c

index 616c103c05ecd874fdb97c4d8bb8408413006085..08c17477e76cbe57ae7ab2a0e5914f7faace77bd 100644 (file)
@@ -43,7 +43,6 @@ enum {
        __BTREE_INSERT_USE_ALLOC_RESERVE,
        __BTREE_INSERT_JOURNAL_REPLAY,
        __BTREE_INSERT_JOURNAL_RESERVED,
-       __BTREE_INSERT_NOMARK_INSERT,
        __BTREE_INSERT_NOMARK_OVERWRITES,
        __BTREE_INSERT_NOMARK,
        __BTREE_INSERT_MARK_INMEM,
@@ -81,9 +80,6 @@ enum {
 
 #define BTREE_INSERT_JOURNAL_RESERVED  (1 << __BTREE_INSERT_JOURNAL_RESERVED)
 
-/* Don't mark new key, just overwrites: */
-#define BTREE_INSERT_NOMARK_INSERT     (1 << __BTREE_INSERT_NOMARK_INSERT)
-
 /* Don't mark overwrites, just new key: */
 #define BTREE_INSERT_NOMARK_OVERWRITES (1 << __BTREE_INSERT_NOMARK_OVERWRITES)
 
index 774201a1c0c55f6a2355873e24b2777dcf54a394..e432a450708125adc63aad49cff0102bbf8a2c92 100644 (file)
@@ -1265,11 +1265,10 @@ int bch2_mark_update(struct btree_trans *trans,
        if (!btree_node_type_needs_gc(iter->btree_id))
                return 0;
 
-       if (!(trans->flags & BTREE_INSERT_NOMARK_INSERT))
-               bch2_mark_key_locked(c, bkey_i_to_s_c(insert->k),
-                       0, insert->k->k.size,
-                       fs_usage, trans->journal_res.seq,
-                       BCH_BUCKET_MARK_INSERT|flags);
+       bch2_mark_key_locked(c, bkey_i_to_s_c(insert->k),
+               0, insert->k->k.size,
+               fs_usage, trans->journal_res.seq,
+               BCH_BUCKET_MARK_INSERT|flags);
 
        if (unlikely(trans->flags & BTREE_INSERT_NOMARK_OVERWRITES))
                return 0;