Commit 3ed94062 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Improve bch2_fatal_error() 



error messages should always include __func__

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

fs/bcachefs/alloc_background.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ int bch2_trigger_alloc(struct btree_trans *trans, 
					bucket_journal_seq);

			if (ret) {

				bch2_fs_fatal_error(c,

					"error setting bucket_needs_journal_commit: %i", ret);

					"setting bucket_needs_journal_commit: %s", bch2_err_str(ret));

				return ret;

			}

		}

fs/bcachefs/btree_io.c

+5 −5
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, 


			ret = bset_encrypt(c, i, b->written << 9);

			if (bch2_fs_fatal_err_on(ret, c,

					"error decrypting btree node: %i", ret))

					"decrypting btree node: %s", bch2_err_str(ret)))

				goto fsck_err;



			btree_err_on(btree_node_type_is_extents(btree_node_type(b)) &&
@@ -1107,7 +1107,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, 


			ret = bset_encrypt(c, i, b->written << 9);

			if (bch2_fs_fatal_err_on(ret, c,

					"error decrypting btree node: %i\n", ret))

					"decrypting btree node: %s", bch2_err_str(ret)))

				goto fsck_err;



			sectors = vstruct_sectors(bne, c->block_bits);
@@ -1874,8 +1874,8 @@ static void btree_node_write_work(struct work_struct *work) 
	return;

err:

	set_btree_node_noevict(b);

	if (!bch2_err_matches(ret, EROFS))

		bch2_fs_fatal_error(c, "fatal error writing btree node: %s", bch2_err_str(ret));

	bch2_fs_fatal_err_on(!bch2_err_matches(ret, EROFS), c,

			     "writing btree node: %s", bch2_err_str(ret));

	goto out;

}
@@ -2131,7 +2131,7 @@ void __bch2_btree_node_write(struct bch_fs *c, struct btree *b, unsigned flags) 


	ret = bset_encrypt(c, i, b->written << 9);

	if (bch2_fs_fatal_err_on(ret, c,

			"error encrypting btree node: %i\n", ret))

			"encrypting btree node: %s", bch2_err_str(ret)))

		goto err;



	nonce = btree_nonce(i, b->written << 9);

fs/bcachefs/btree_key_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static int btree_key_cache_flush_pos(struct btree_trans *trans, 
			     !bch2_err_matches(ret, BCH_ERR_transaction_restart) &&

			     !bch2_err_matches(ret, BCH_ERR_journal_reclaim_would_deadlock) &&

			     !bch2_journal_error(j), c,

			     "error flushing key cache: %s", bch2_err_str(ret));

			     "flushing key cache: %s", bch2_err_str(ret));

	if (ret)

		goto out;

fs/bcachefs/btree_update_interior.c

+3 −2
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static void btree_update_nodes_written(struct btree_update *as) 
	bch2_trans_unlock(trans);



	bch2_fs_fatal_err_on(ret && !bch2_journal_error(&c->journal), c,

			     "%s(): error %s", __func__, bch2_err_str(ret));

			     "%s", bch2_err_str(ret));

err:

	if (as->b) {
@@ -1193,7 +1193,8 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, 
err:

	bch2_btree_update_free(as, trans);

	if (!bch2_err_matches(ret, ENOSPC) &&

	    !bch2_err_matches(ret, EROFS))

	    !bch2_err_matches(ret, EROFS) &&

	    ret != -BCH_ERR_journal_reclaim_would_deadlock)

		bch_err_fn_ratelimited(c, ret);

	return ERR_PTR(ret);

}

fs/bcachefs/btree_write_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int bch2_btree_write_buffer_flush_locked(struct btree_trans *trans) 
		}

	}

err:

	bch2_fs_fatal_err_on(ret, c, "%s: insert error %s", __func__, bch2_err_str(ret));

	bch2_fs_fatal_err_on(ret, c, "%s", bch2_err_str(ret));

	trace_write_buffer_flush(trans, wb->flushing.keys.nr, skipped, fast, 0);

	bch2_journal_pin_drop(j, &wb->flushing.pin);

	wb->flushing.keys.nr = 0;