Update bcachefs sources to 3ca08ab51ec9 bcachefs: six locks: Simplify optimistic...

[bcachefs-tools-debian] / libbcachefs / bkey_methods.c

diff --git a/libbcachefs/bkey_methods.c b/libbcachefs/bkey_methods.c
index 2f518d7e1a6444fa2f03b86235f850f7190c010c..761f5e33b1e69e94ca0aaaa41a9825e496b5840f 100644 (file)
--- a/libbcachefs/bkey_methods.c
+++ b/libbcachefs/bkey_methods.c
@@ -186,15 +186,20 @@ int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
        if (type != BKEY_TYPE_btree) {
                enum btree_id btree = type - 1;
 
-               bkey_fsck_err_on(!btree_type_has_snapshots(btree) &&
-                                k.k->p.snapshot, c, err,
-                                bkey_snapshot_nonzero,
-                                "nonzero snapshot");
-
-               bkey_fsck_err_on(btree_type_has_snapshots(btree) &&
-                                !k.k->p.snapshot, c, err,
-                                bkey_snapshot_zero,
-                                "snapshot == 0");
+               if (btree_type_has_snapshots(btree)) {
+                       bkey_fsck_err_on(!k.k->p.snapshot, c, err,
+                                        bkey_snapshot_zero,
+                                        "snapshot == 0");
+               } else if (!btree_type_has_snapshot_field(btree)) {
+                       bkey_fsck_err_on(k.k->p.snapshot, c, err,
+                                        bkey_snapshot_nonzero,
+                                        "nonzero snapshot");
+               } else {
+                       /*
+                        * btree uses snapshot field but it's not required to be
+                        * nonzero
+                        */
+               }
 
                bkey_fsck_err_on(bkey_eq(k.k->p, POS_MAX), c, err,
                                 bkey_at_pos_max,