diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-20 12:33:59 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-10-20 12:36:50 -0400 |
commit | 3db6ec44c5c7c39cb0067a6b02ef22090ecbaa98 (patch) | |
tree | c23c334375e5a3ecea30131f94f2fd9866035420 /libbcachefs/btree_update.h | |
parent | 1fe24a0e836503026529a692ccd214331c29d224 (diff) |
Update bcachefs sources to d9d1235f3c bcachefs: Handle transaction restarts in bch2_blacklist_entries_gc()
Diffstat (limited to 'libbcachefs/btree_update.h')
-rw-r--r-- | libbcachefs/btree_update.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/btree_update.h b/libbcachefs/btree_update.h index 4d0ece3..155643d 100644 --- a/libbcachefs/btree_update.h +++ b/libbcachefs/btree_update.h @@ -120,14 +120,14 @@ static inline int bch2_trans_commit(struct btree_trans *trans, #define bch2_trans_do(_c, _disk_res, _journal_seq, _flags, _do) \ ({ \ struct btree_trans trans; \ - int _ret, _ret2; \ + int _ret; \ \ bch2_trans_init(&trans, (_c), 0, 0); \ _ret = __bch2_trans_do(&trans, _disk_res, _journal_seq, _flags, \ _do); \ - _ret2 = bch2_trans_exit(&trans); \ + bch2_trans_exit(&trans); \ \ - _ret ?: _ret2; \ + _ret; \ }) #define trans_for_each_update(_trans, _i) \ |