bcachefs: BCH_SNAPSHOT_DELETED -> BCH_SNAPSHOT_WILL_DELETE

We're going to be speeding up snapshot deletion, by only having it
process the extents/dirents/xattrs btrees if an inode of a given
snapshot ID was present.

This raises the possibility of 'bkey_in_missing_snapshot' errors popping
up, if we ever accidentally don't do the corresponding inode update, or
if the new algorithm has bugs.

So we'll want to be able to differentiate more definitively between
'snapshot went missing' (and perhaps needs to be reconstructed), and
'key in snapshot that was deleted'.

So instead of deleting snapshot IDs, we'll be adding a new deleted flag
and leaving them permanently.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
index f133704d50a2b1e0f0164d7e053847b435376f30..87c8aead86105e07efc90766551437ba44e4900b 100644 (file)
--- a/fs/bcachefs/snapshot.c
+++ b/fs/bcachefs/snapshot.c
@@ -213,7 +213,7 @@ void bch2_snapshot_to_text(struct printbuf *out, struct bch_fs *c,
 
        prt_printf(out, "is_subvol %llu deleted %llu parent %10u children %10u %10u subvol %u tree %u",
               BCH_SNAPSHOT_SUBVOL(s.v),
-              BCH_SNAPSHOT_DELETED(s.v),
+              BCH_SNAPSHOT_WILL_DELETE(s.v),
               le32_to_cpu(s.v->parent),
               le32_to_cpu(s.v->children[0]),
               le32_to_cpu(s.v->children[1]),
@@ -339,7 +339,7 @@ static int __bch2_mark_snapshot(struct btree_trans *trans,
                       parent - id - 1 < IS_ANCESTOR_BITMAP)
                        __set_bit(parent - id - 1, t->is_ancestor);
 
-               if (BCH_SNAPSHOT_DELETED(s.v)) {
+               if (BCH_SNAPSHOT_WILL_DELETE(s.v)) {
                        set_bit(BCH_FS_need_delete_dead_snapshots, &c->flags);
                        if (c->curr_recovery_pass > BCH_RECOVERY_PASS_delete_dead_snapshots)
                                bch2_delete_dead_snapshots_async(c);
@@ -748,7 +748,7 @@ static int check_snapshot(struct btree_trans *trans,
        }
 
        bool should_have_subvol = BCH_SNAPSHOT_SUBVOL(&s) &&
-               !BCH_SNAPSHOT_DELETED(&s);
+               !BCH_SNAPSHOT_WILL_DELETE(&s);
 
        if (should_have_subvol) {
                id = le32_to_cpu(s.subvol);
@@ -1062,10 +1062,10 @@ int bch2_snapshot_node_set_deleted(struct btree_trans *trans, u32 id)
        }
 
        /* already deleted? */
-       if (BCH_SNAPSHOT_DELETED(&s->v))
+       if (BCH_SNAPSHOT_WILL_DELETE(&s->v))
                goto err;
 
-       SET_BCH_SNAPSHOT_DELETED(&s->v, true);
+       SET_BCH_SNAPSHOT_WILL_DELETE(&s->v, true);
        SET_BCH_SNAPSHOT_SUBVOL(&s->v, false);
        s->v.subvol = 0;
 err:
@@ -1782,7 +1782,7 @@ static int bch2_check_snapshot_needs_deletion(struct btree_trans *trans, struct
                return 0;
 
        struct bkey_s_c_snapshot snap = bkey_s_c_to_snapshot(k);
-       if (BCH_SNAPSHOT_DELETED(snap.v) ||
+       if (BCH_SNAPSHOT_WILL_DELETE(snap.v) ||
            interior_snapshot_needs_delete(snap))
                set_bit(BCH_FS_need_delete_dead_snapshots, &trans->c->flags);
 

diff --git a/fs/bcachefs/snapshot_format.h b/fs/bcachefs/snapshot_format.h
index aabcd3a74cd95d6712f7f9f257cc8ee2caac4958..685a9fe209ab2cbda2661591e3ebb6c725ea8225 100644 (file)
--- a/fs/bcachefs/snapshot_format.h
+++ b/fs/bcachefs/snapshot_format.h
@@ -15,7 +15,7 @@ struct bch_snapshot {
        bch_le128               btime;
 };
 
-LE32_BITMASK(BCH_SNAPSHOT_DELETED,     struct bch_snapshot, flags,  0,  1)
+LE32_BITMASK(BCH_SNAPSHOT_WILL_DELETE, struct bch_snapshot, flags,  0,  1)
 
 /* True if a subvolume points to this snapshot node: */
 LE32_BITMASK(BCH_SNAPSHOT_SUBVOL,      struct bch_snapshot, flags,  1,  2)