diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-18 05:06:38 +0200 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 23:09:37 +0200 |
| commit | 549d173c1bd9b58c2ad41217522462e012a6545f (patch) | |
| tree | 9bf146d761ae1f81ba18ec45a1bda63cb47549eb /fs/bcachefs/migrate.c | |
| parent | bcachefs: btree_trans_too_many_iters() is now a transaction restart (diff) | |
| download | linux-549d173c1bd9b58c2ad41217522462e012a6545f.tar.xz linux-549d173c1bd9b58c2ad41217522462e012a6545f.zip | |
bcachefs: EINTR -> BCH_ERR_transaction_restart
Now that we have error codes, with subtypes, we can switch to our own
error code for transaction restarts - and even better, a distinct error
code for each transaction restart reason: clearer code and better
debugging.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/migrate.c')
| -rw-r--r-- | fs/bcachefs/migrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index baeca0e2a302..8b258d966d04 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -146,7 +146,7 @@ retry: } ret = bch2_btree_node_update_key(&trans, &iter, b, k.k, false); - if (ret == -EINTR) { + if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) { ret = 0; continue; } @@ -159,7 +159,7 @@ retry: next: bch2_btree_iter_next_node(&iter); } - if (ret == -EINTR) + if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) goto retry; bch2_trans_iter_exit(&trans, &iter); @@ -174,7 +174,7 @@ err: bch2_trans_exit(&trans); bch2_bkey_buf_exit(&k, c); - BUG_ON(ret == -EINTR); + BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart)); return ret; } |