From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 30 May 2025 23:09:11 +0000 (-0400)
Subject: bcachefs: Add better logging to fsck_rename_dirent()
X-Git-Tag: v6.16-rc1~48^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=132263220ddacaa5d4a93c34675eb9639dcc3707;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Add better logging to fsck_rename_dirent()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/str_hash.c b/fs/bcachefs/str_hash.c
index f101ca8581d99..7b97852d1cdf8 100644
--- a/fs/bcachefs/str_hash.c
+++ b/fs/bcachefs/str_hash.c
@@ -61,14 +61,19 @@ static noinline int fsck_rename_dirent(struct btree_trans *trans,
 						(subvol_inum) { 0, old.k->p.inode },
 						old.k->p.snapshot, &new->k_i,
 						BTREE_UPDATE_internal_snapshot_node);
-		if (!bch2_err_matches(ret, EEXIST))
+		if (ret && !bch2_err_matches(ret, EEXIST))
+			goto err;
+		if (!ret)
 			break;
 	}
 
 	if (ret)
-		return ret;
+		goto err;
 
-	return bch2_fsck_update_backpointers(trans, s, desc, hash_info, &new->k_i);
+	ret = bch2_fsck_update_backpointers(trans, s, desc, hash_info, &new->k_i);
+err:
+	bch_err_fn(trans->c, ret);
+	return ret;
 }
 
 static noinline int hash_pick_winner(struct btree_trans *trans,