Commit d4b30ed9 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: bch2_run_explicit_recovery_pass() cleanup 



Consolidate the run_explicit_recovery_pass() interfaces by adding a
flags parameter; this will also let us add a RUN_RECOVERY_PASS_ratelimit
flag.

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

fs/bcachefs/btree_node_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ int bch2_get_scanned_nodes(struct bch_fs *c, enum btree_id btree, 


	struct find_btree_nodes *f = &c->found_btree_nodes;



	int ret = bch2_run_explicit_recovery_pass(c, BCH_RECOVERY_PASS_scan_for_btree_nodes);

	int ret = bch2_run_print_explicit_recovery_pass(c, BCH_RECOVERY_PASS_scan_for_btree_nodes);

	if (ret)

		return ret;

fs/bcachefs/buckets.c

+4 −4
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static int bucket_ref_update_err(struct btree_trans *trans, struct printbuf *buf 


	bool print = __bch2_count_fsck_err(c, id, buf);



	int ret = bch2_run_explicit_recovery_pass_persistent(c, buf,

					BCH_RECOVERY_PASS_check_allocations);

	int ret = bch2_run_explicit_recovery_pass(c, buf,

					BCH_RECOVERY_PASS_check_allocations, 0);



	if (insert) {

		bch2_trans_updates_to_text(buf, trans);
@@ -972,8 +972,8 @@ static int __bch2_trans_mark_metadata_bucket(struct btree_trans *trans, 


		bool print = bch2_count_fsck_err(c, bucket_metadata_type_mismatch, &buf);



		bch2_run_explicit_recovery_pass_persistent(c, &buf,

					BCH_RECOVERY_PASS_check_allocations);

		bch2_run_explicit_recovery_pass(c, &buf,

					BCH_RECOVERY_PASS_check_allocations, 0);



		if (print)

			bch2_print_str(c, KERN_ERR, buf.buf);

fs/bcachefs/errcode.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ 
	x(BCH_ERR_fsck,			fsck_repair_unimplemented)		\

	x(BCH_ERR_fsck,			fsck_repair_impossible)			\

	x(EINVAL,			restart_recovery)			\

	x(EINVAL,			not_in_recovery)			\

	x(EINVAL,			cannot_rewind_recovery)			\

	x(0,				data_update_done)			\

	x(BCH_ERR_data_update_done,	data_update_done_would_block)		\

fs/bcachefs/error.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int __bch2_topology_error(struct bch_fs *c, struct printbuf *out) 
		__bch2_inconsistent_error(c, out);

		return -BCH_ERR_btree_need_topology_repair;

	} else {

		return bch2_run_explicit_recovery_pass_persistent(c, out, BCH_RECOVERY_PASS_check_topology) ?:

		return bch2_run_explicit_recovery_pass(c, out, BCH_RECOVERY_PASS_check_topology, 0) ?:

			-BCH_ERR_btree_node_read_validate_error;

	}

}

fs/bcachefs/recovery.c

+15 −16
Original line number Diff line number Diff line
@@ -52,24 +52,24 @@ int bch2_btree_lost_data(struct bch_fs *c, 
	}



	/* Once we have runtime self healing for topology errors we won't need this: */

	ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_topology) ?: ret;

	ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_topology, 0) ?: ret;



	/* Btree node accounting will be off: */

	__set_bit_le64(BCH_FSCK_ERR_accounting_mismatch, ext->errors_silent);

	ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_allocations) ?: ret;

	ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_allocations, 0) ?: ret;



#ifdef CONFIG_BCACHEFS_DEBUG

	/*

	 * These are much more minor, and don't need to be corrected right away,

	 * but in debug mode we want the next fsck run to be clean:

	 */

	ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_lrus) ?: ret;

	ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_backpointers_to_extents) ?: ret;

	ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_lrus, 0) ?: ret;

	ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_backpointers_to_extents, 0) ?: ret;

#endif



	switch (btree) {

	case BTREE_ID_alloc:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_alloc_info) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_alloc_info, 0) ?: ret;



		__set_bit_le64(BCH_FSCK_ERR_alloc_key_data_type_wrong, ext->errors_silent);

		__set_bit_le64(BCH_FSCK_ERR_alloc_key_gen_wrong, ext->errors_silent);
@@ -79,30 +79,30 @@ int bch2_btree_lost_data(struct bch_fs *c, 
		__set_bit_le64(BCH_FSCK_ERR_alloc_key_stripe_redundancy_wrong, ext->errors_silent);

		goto out;

	case BTREE_ID_backpointers:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_btree_backpointers) ?: ret;

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_extents_to_backpointers) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_btree_backpointers, 0) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_extents_to_backpointers, 0) ?: ret;

		goto out;

	case BTREE_ID_need_discard:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_alloc_info) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_alloc_info, 0) ?: ret;

		goto out;

	case BTREE_ID_freespace:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_alloc_info) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_alloc_info, 0) ?: ret;

		goto out;

	case BTREE_ID_bucket_gens:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_alloc_info) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_alloc_info, 0) ?: ret;

		goto out;

	case BTREE_ID_lru:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_alloc_info) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_alloc_info, 0) ?: ret;

		goto out;

	case BTREE_ID_accounting:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_check_allocations) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_check_allocations, 0) ?: ret;

		goto out;

	case BTREE_ID_snapshots:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_reconstruct_snapshots) ?: ret;

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_scan_for_btree_nodes) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_reconstruct_snapshots, 0) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_scan_for_btree_nodes, 0) ?: ret;

		goto out;

	default:

		ret = __bch2_run_explicit_recovery_pass_persistent(c, msg, BCH_RECOVERY_PASS_scan_for_btree_nodes) ?: ret;

		ret = __bch2_run_explicit_recovery_pass(c, msg, BCH_RECOVERY_PASS_scan_for_btree_nodes, 0) ?: ret;

		goto out;

	}

out:
@@ -978,7 +978,6 @@ int bch2_fs_recovery(struct bch_fs *c) 
	 */

	set_bit(BCH_FS_may_go_rw, &c->flags);

	clear_bit(BCH_FS_in_fsck, &c->flags);

	clear_bit(BCH_FS_in_recovery, &c->flags);



	/* in case we don't run journal replay, i.e. norecovery mode */

	set_bit(BCH_FS_accounting_replay_done, &c->flags);