bcachefs: Fix btree_err() macro
authorKent Overstreet <kent.overstreet@linux.dev>
Fri, 4 Aug 2023 00:32:46 +0000 (20:32 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:10:09 +0000 (17:10 -0400)
Error code wasn't being propagated correctly, change it to match
fsck_err()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_io.c

index 224ed5216b0a5dffd5869a39327d2adc3f310072..80bd84f90dbf4b5cd1eb8d09bef4430184854d33 100644 (file)
@@ -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;                                              \
 })