From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 4 Aug 2023 00:32:46 +0000 (-0400)
Subject: bcachefs: Fix btree_err() macro
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=73adfcaf54c8fae86d80da9acad828ee2001cd60;p=linux.git

bcachefs: Fix btree_err() macro

Error code wasn't being propagated correctly, change it to match
fsck_err()

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

diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index 224ed5216b0a5..80bd84f90dbf4 100644
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -630,8 +630,11 @@ fsck_err:
 ({									\
 	int _ret = __btree_err(type, c, ca, b, i, write, have_retry, msg, ##__VA_ARGS__);\
 									\
-	if (_ret != -BCH_ERR_fsck_fix)					\
+	if (_ret != -BCH_ERR_fsck_fix) {				\
+		ret = _ret;						\
 		goto fsck_err;						\
+	}								\
+									\
 	*saw_error = true;						\
 })