public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcachefs: Don't allocate memory under mark_lock

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2019-10-04 19:14:43 -04:00 • committed by Kent Overstreet
parent 137b0ed907
commit 0741d37821
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/bcachefs/btree_gc.c
View file

@ -642,12 +642,7 @@ static int bch2_gc_start(struct bch_fs *c,
{
struct bch_dev *ca;
unsigned i;
/*
* indicate to stripe code that we need to allocate for the gc stripes
* radix tree, too
*/
gc_pos_set(c, gc_phase(GC_PHASE_START));
int ret;
BUG_ON(c->usage_gc);
@ -675,6 +670,18 @@ static int bch2_gc_start(struct bch_fs *c,
}
}
ret = bch2_ec_mem_alloc(c, true);
if (ret)
return ret;
percpu_down_write(&c->mark_lock);
/*
* indicate to stripe code that we need to allocate for the gc stripes
* radix tree, too
*/
gc_pos_set(c, gc_phase(GC_PHASE_START));
for_each_member_device(ca, c, i) {
struct bucket_array *dst = __bucket_array(ca, 1);
struct bucket_array *src = __bucket_array(ca, 0);
@ -699,7 +706,9 @@ static int bch2_gc_start(struct bch_fs *c,
}
};
return bch2_ec_mem_alloc(c, true);
percpu_up_write(&c->mark_lock);
return 0;
}
/**
@ -732,10 +741,7 @@ int bch2_gc(struct bch_fs *c, struct journal_keys *journal_keys,
down_write(&c->gc_lock);
again:
percpu_down_write(&c->mark_lock);
ret = bch2_gc_start(c, metadata_only);
percpu_up_write(&c->mark_lock);
if (ret)
goto out;