diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-07 00:37:46 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-08-11 19:21:24 -0400 |
| commit | bdee86bb4d38482669a8ad5c07f69c08dea80911 (patch) | |
| tree | af8c2ce043ab3d1f8cbf60e9111aad461d6507c8 | |
| parent | 49c34dadcad9c33b1e8510b5543d60c40fa0bebd (diff) | |
bcachefs: Add assertions for unexpected transaction restarts
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_iter.h | 12 | ||||
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index f38fd25b4992..89007e679c8a 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -392,13 +392,17 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, #define lockrestart_do(_trans, _do) \ ({ \ + u32 _restart_count; \ int _ret; \ \ do { \ - bch2_trans_begin(_trans); \ + _restart_count = bch2_trans_begin(_trans); \ _ret = (_do); \ } while (bch2_err_matches(_ret, BCH_ERR_transaction_restart)); \ \ + if (!_ret) \ + bch2_trans_verify_not_restarted(_trans, _restart_count);\ + \ _ret; \ }) @@ -439,7 +443,7 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, (_start), (_flags)); \ \ while (1) { \ - bch2_trans_begin(_trans); \ + u32 _restart_count = bch2_trans_begin(_trans); \ (_k) = bch2_btree_iter_peek_type(&(_iter), (_flags)); \ if (!(_k).k) { \ _ret = 0; \ @@ -451,6 +455,7 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, continue; \ if (_ret) \ break; \ + bch2_trans_verify_not_restarted(_trans, _restart_count);\ if (!bch2_btree_iter_advance(&(_iter))) \ break; \ } \ @@ -468,7 +473,7 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, (_start), (_flags)); \ \ while (1) { \ - bch2_trans_begin(_trans); \ + u32 _restart_count = bch2_trans_begin(_trans); \ (_k) = bch2_btree_iter_peek_prev_type(&(_iter), (_flags));\ if (!(_k).k) { \ _ret = 0; \ @@ -480,6 +485,7 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans, continue; \ if (_ret) \ break; \ + bch2_trans_verify_not_restarted(_trans, _restart_count);\ if (!bch2_btree_iter_rewind(&(_iter))) \ break; \ } \ diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index e4138614e081..d6c5d0fe4d4e 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -980,6 +980,7 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, unsigned update_level = level; int journal_flags = flags & JOURNAL_WATERMARK_MASK; int ret = 0; + u32 restart_count = trans->restart_count; BUG_ON(!path->should_be_locked); @@ -1080,6 +1081,7 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, if (ret) goto err; + bch2_trans_verify_not_restarted(trans, restart_count); return as; err: bch2_btree_update_free(as); |