alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-02 00:00:03 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix init_layout()

Browse Source 
It was incorrectly failing when we did have enough space for the
superblocks - >= should have been >.  Also, give it a better error
message.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-12-19 21:55:09 -05:00
parent d06f5690fa
commit 6a4f458a48
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libbcachefs.c
View File

@ -40,6 +40,7 @@ static void init_layout(struct bch_sb_layout *l,
unsigned sb_size,
u64 sb_start, u64 sb_end)
{
u64 sb_pos = sb_start;
unsigned i;
memset(l, 0, sizeof(*l));
@ -51,15 +52,16 @@ static void init_layout(struct bch_sb_layout *l,
/* Create two superblocks in the allowed range: */
for (i = 0; i < l->nr_superblocks; i++) {
if (sb_start != BCH_SB_SECTOR)
sb_start = round_up(sb_start, block_size);
if (sb_pos != BCH_SB_SECTOR)
sb_pos = round_up(sb_pos, block_size);
l->sb_offset[i] = cpu_to_le64(sb_start);
sb_start += sb_size;
l->sb_offset[i] = cpu_to_le64(sb_pos);
sb_pos += sb_size;
}
if (sb_start >= sb_end)
die("insufficient space for superblocks");
if (sb_pos > sb_end)
die("insufficient space for superblocks: start %llu end %llu > %llu size %u",
sb_start, sb_pos, sb_end, sb_size);
}
void bch2_pick_bucket_size(struct bch_opts opts, struct dev_opts *dev)