Commit 8f3aaa5d authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: bch2_fs_btree_gc_init() 



Now returns errors, prep work for check_allocations_done_lock

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent cb3f3498

fs/bcachefs/btree_gc.c

+9 −2
Original line number Diff line number Diff line
@@ -1238,9 +1238,16 @@ void bch2_gc_gens_async(struct bch_fs *c) 
		bch2_write_ref_put(c, BCH_WRITE_REF_gc_gens);

}



void bch2_fs_gc_init(struct bch_fs *c)

void bch2_fs_btree_gc_exit(struct bch_fs *c)

{

	seqcount_init(&c->gc_pos_lock);

}



int bch2_fs_btree_gc_init(struct bch_fs *c)

{

	seqcount_init(&c->gc_pos_lock);

	INIT_WORK(&c->gc_gens_work, bch2_gc_gens_work);



	init_rwsem(&c->gc_lock);

	mutex_init(&c->gc_gens_lock);

	return 0;

}

fs/bcachefs/btree_gc.h

+3 −1
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ void bch2_gc_pos_to_text(struct printbuf *, struct gc_pos *); 


int bch2_gc_gens(struct bch_fs *);

void bch2_gc_gens_async(struct bch_fs *);

void bch2_fs_gc_init(struct bch_fs *);



void bch2_fs_btree_gc_exit(struct bch_fs *);

int bch2_fs_btree_gc_init(struct bch_fs *);



#endif /* _BCACHEFS_BTREE_GC_H */

fs/bcachefs/super.c

+2 −4
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ static void __bch2_fs_free(struct bch_fs *c) 
	bch2_io_clock_exit(&c->io_clock[WRITE]);

	bch2_io_clock_exit(&c->io_clock[READ]);

	bch2_fs_compress_exit(c);

	bch2_fs_btree_gc_exit(c);

	bch2_journal_keys_put_initial(c);

	bch2_find_btree_nodes_exit(&c->found_btree_nodes);

	BUG_ON(atomic_read(&c->journal_keys.ref));
@@ -770,13 +771,9 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts) 
	spin_lock_init(&c->recovery_pass_lock);

	sema_init(&c->online_fsck_mutex, 1);



	init_rwsem(&c->gc_lock);

	mutex_init(&c->gc_gens_lock);



	for (i = 0; i < BCH_TIME_STAT_NR; i++)

		bch2_time_stats_init(&c->times[i]);



	bch2_fs_gc_init(c);

	bch2_fs_copygc_init(c);

	bch2_fs_btree_key_cache_init_early(&c->btree_key_cache);

	bch2_fs_btree_iter_init_early(c);
@@ -911,6 +908,7 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts) 
	    bch2_fs_btree_cache_init(c) ?:

	    bch2_fs_btree_key_cache_init(&c->btree_key_cache) ?:

	    bch2_fs_btree_interior_update_init(c) ?:

	    bch2_fs_btree_gc_init(c) ?:

	    bch2_fs_buckets_waiting_for_journal_init(c) ?:

	    bch2_fs_btree_write_buffer_init(c) ?:

	    bch2_fs_subvolumes_init(c) ?: