kevin/linux
1
Fork 0
Code

bcachefs: Write out alloc info more carefully

Browse Source 
In flight btree updates could update alloc info until they're flushed -
so we have to try writing again after they've been flushed.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2019-03-28 03:40:39 -04:00 committed by Kent Overstreet
parent ccaa61c9f6
commit d5f70c1f27
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/bcachefs/super.c
View File

@ -175,7 +175,7 @@ static void __bch2_fs_read_only(struct bch_fs *c)
{
struct bch_dev *ca;
bool wrote;
unsigned i;
unsigned i, clean_passes = 0;
int ret;
bch2_rebalance_stop(c);
@ -195,18 +195,18 @@ static void __bch2_fs_read_only(struct bch_fs *c)
goto allocator_not_running;
do {
ret = bch2_alloc_write(c, false, &wrote);
if (ret) {
bch2_fs_inconsistent(c, "error writing out alloc info %i", ret);
break;
}
ret = bch2_stripes_write(c, &wrote);
if (ret) {
bch2_fs_inconsistent(c, "error writing out stripes");
break;
}
ret = bch2_alloc_write(c, false, &wrote);
if (ret) {
bch2_fs_inconsistent(c, "error writing out alloc info %i", ret);
break;
}
for_each_member_device(ca, c, i)
bch2_dev_allocator_quiesce(c, ca);
@ -221,7 +221,9 @@ static void __bch2_fs_read_only(struct bch_fs *c)
*/
closure_wait_event(&c->btree_interior_update_wait,
!bch2_btree_interior_updates_nr_pending(c));
} while (wrote);
clean_passes = wrote ? 0 : clean_passes + 1;
} while (clean_passes < 2);
allocator_not_running:
for_each_member_device(ca, c, i)
bch2_dev_allocator_stop(ca);