bcachefs: Fix bch2_dev_btree_bitmap_marked_sectors() shift

Kent Overstreet · Kent Overstreet · commit fa845c73497f · 2024-04-17T17:29:53.000-04:00
Fixes: 27c15ed bcachefs: bch_member.btree_allocated_bitmap Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
diff --git a/fs/bcachefs/sb-members.c b/fs/bcachefs/sb-members.c
@@ -463,8 +463,8 @@ static void __bch2_dev_btree_bitmap_mark(struct bch_sb_field_members_v2 *mi, uns
 		m->btree_bitmap_shift += resize;
 	}
 
-	for (unsigned bit = sectors >> m->btree_bitmap_shift;
-	     bit << m->btree_bitmap_shift < end;
+	for (unsigned bit = start >> m->btree_bitmap_shift;
+	     (u64) bit << m->btree_bitmap_shift < end;
 	     bit++)
 		bitmap |= BIT_ULL(bit);
 
diff --git a/fs/bcachefs/sb-members.h b/fs/bcachefs/sb-members.h
@@ -235,11 +235,11 @@ static inline bool bch2_dev_btree_bitmap_marked_sectors(struct bch_dev *ca, u64
 {
 	u64 end = start + sectors;
 
-	if (end > 64 << ca->mi.btree_bitmap_shift)
+	if (end > 64ULL << ca->mi.btree_bitmap_shift)
 		return false;
 
-	for (unsigned bit = sectors >> ca->mi.btree_bitmap_shift;
-	     bit << ca->mi.btree_bitmap_shift < end;
+	for (unsigned bit = start >> ca->mi.btree_bitmap_shift;
+	     (u64) bit << ca->mi.btree_bitmap_shift < end;
 	     bit++)
 		if (!(ca->mi.btree_allocated_bitmap & BIT_ULL(bit)))
 			return false;

Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,8 @@ static void __bch2_dev_btree_bitmap_mark(struct bch_sb_field_members_v2 *mi, uns`
`463`	`463`	`m->btree_bitmap_shift += resize;`
`464`	`464`	`}`
`465`	`465`
`466`		`- for (unsigned bit = sectors >> m->btree_bitmap_shift;`
`467`		`- bit << m->btree_bitmap_shift < end;`
	`466`	`+ for (unsigned bit = start >> m->btree_bitmap_shift;`
	`467`	`+ (u64) bit << m->btree_bitmap_shift < end;`
`468`	`468`	`bit++)`
`469`	`469`	`bitmap \|= BIT_ULL(bit);`
`470`	`470`