bcachefs: Change lockrestart_do() to always call bch2_trans_begin()

More consistent behaviour means less likely to trip over ourselves in
silly ways.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index b5f35a4190045dac3c0cc7e07d51a84d29f36a0c..a1f2d982282117760848c7c1da6c20475d7dd7f8 100644 (file)
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -110,12 +110,10 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
 ({                                                                     \
        int _ret;                                                       \
                                                                        \
-       while (1) {                                                     \
-               _ret = (_do);                                           \
-               if (_ret != -EINTR)                                     \
-                       break;                                          \
+       do {                                                            \
                bch2_trans_begin(_trans);                               \
-       }                                                               \
+               _ret = (_do);                                           \
+       } while (_ret == -EINTR);                                       \
                                                                        \
        _ret;                                                           \
 })