bcachefs: bucket_pos_to_bp_noerror()

We don't want the assert when we're checking if the backpointer is
valid.

Reported-by: syzbot+bf7215c0525098e7747a@syzkaller.appspotmail.com
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c
index a200442010025a0d8ee7b421d12edb32ff5c5a01..af7a71de1bdfeb8ab0c5dfae05fdf2b55a2c06d5 100644 (file)
--- a/fs/bcachefs/backpointers.c
+++ b/fs/bcachefs/backpointers.c
@@ -54,7 +54,7 @@ int bch2_backpointer_invalid(struct bch_fs *c, struct bkey_s_c k,
        int ret = 0;
 
        bkey_fsck_err_on((bp.v->bucket_offset >> MAX_EXTENT_COMPRESS_RATIO_SHIFT) >= ca->mi.bucket_size ||
-                        !bpos_eq(bp.k->p, bucket_pos_to_bp(c, bucket, bp.v->bucket_offset)),
+                        !bpos_eq(bp.k->p, bucket_pos_to_bp_noerror(ca, bucket, bp.v->bucket_offset)),
                         c, err,
                         backpointer_bucket_offset_wrong,
                         "backpointer bucket_offset wrong");

diff --git a/fs/bcachefs/backpointers.h b/fs/bcachefs/backpointers.h
index 85949b9fd880ce2fcce508ba4018350a5dfac9ca..c1b274eadda141a755831aa4b2199f315cea95d9 100644 (file)
--- a/fs/bcachefs/backpointers.h
+++ b/fs/bcachefs/backpointers.h
@@ -45,6 +45,15 @@ static inline struct bpos bp_pos_to_bucket(const struct bch_fs *c,
        return POS(bp_pos.inode, sector_to_bucket(ca, bucket_sector));
 }
 
+static inline struct bpos bucket_pos_to_bp_noerror(const struct bch_dev *ca,
+                                                  struct bpos bucket,
+                                                  u64 bucket_offset)
+{
+       return POS(bucket.inode,
+                  (bucket_to_sector(ca, bucket.offset) <<
+                   MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);
+}
+
 /*
  * Convert from pos in alloc btree + bucket offset to pos in backpointer btree:
  */
@@ -53,10 +62,7 @@ static inline struct bpos bucket_pos_to_bp(const struct bch_fs *c,
                                           u64 bucket_offset)
 {
        struct bch_dev *ca = bch_dev_bkey_exists(c, bucket.inode);
-       struct bpos ret = POS(bucket.inode,
-                             (bucket_to_sector(ca, bucket.offset) <<
-                              MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);
-
+       struct bpos ret = bucket_pos_to_bp_noerror(ca, bucket, bucket_offset);
        EBUG_ON(!bkey_eq(bucket, bp_pos_to_bucket(c, ret)));
        return ret;
 }