bcachefs: bch2_btree_node_rewrite() now returns transaction restarts

We have been getting away from handling transaction restarts locally -
convert bch2_btree_node_rewrite() to the newer style.

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

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 75d881b7a6c9d6b2655987dfe3cdf6c0feea0868..4fc882b15d936a5a068f6ff5d3fe3e9b9aa847b9 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -817,15 +817,13 @@ static int bch2_gc_btree(struct bch_fs *c, enum btree_id btree_id,
 
                if (!initial) {
                        if (max_stale > 64)
-                               bch2_btree_node_rewrite(&trans, &iter,
-                                               b->data->keys.seq,
+                               bch2_btree_node_rewrite(&trans, &iter, b,
                                                BTREE_INSERT_NOWAIT|
                                                BTREE_INSERT_GC_LOCK_HELD);
                        else if (!bch2_btree_gc_rewrite_disabled &&
                                 (bch2_btree_gc_always_rewrite || max_stale > 16))
                                bch2_btree_node_rewrite(&trans, &iter,
-                                               b->data->keys.seq,
-                                               BTREE_INSERT_NOWAIT|
+                                               b, BTREE_INSERT_NOWAIT|
                                                BTREE_INSERT_GC_LOCK_HELD);
                }
        }

diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index 2ffee9029f344922eb07ee0d4ca7dc6886015ea7..4c1a1b617bf121554db11197c8ab6605bae80d34 100644 (file)
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -66,7 +66,7 @@ int bch2_btree_delete_range(struct bch_fs *, enum btree_id,
                            struct bpos, struct bpos, u64 *);
 
 int bch2_btree_node_rewrite(struct btree_trans *, struct btree_iter *,
-                           __le64, unsigned);
+                           struct btree *, unsigned);
 void bch2_btree_node_rewrite_async(struct bch_fs *, struct btree *);
 int bch2_btree_node_update_key(struct btree_trans *, struct btree_iter *,
                               struct btree *, struct bkey_i *, bool);

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 14ecd3f863de5abcc853855d9f227ea00df3ea99..a28c7cf381ce8c8770dc611afacc16b87eedc4f4 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1722,26 +1722,15 @@ err:
  */
 int bch2_btree_node_rewrite(struct btree_trans *trans,
                            struct btree_iter *iter,
-                           __le64 seq, unsigned flags)
+                           struct btree *b,
+                           unsigned flags)
 {
        struct bch_fs *c = trans->c;
-       struct btree *b, *n, *parent;
+       struct btree *n, *parent;
        struct btree_update *as;
        int ret;
 
        flags |= BTREE_INSERT_NOFAIL;
-retry:
-       ret = bch2_btree_iter_traverse(iter);
-       if (ret)
-               goto out;
-
-       b = bch2_btree_iter_peek_node(iter);
-       ret = PTR_ERR_OR_ZERO(b);
-       if (ret)
-               goto out;
-
-       if (!b || b->data->keys.seq != seq)
-               goto out;
 
        parent = btree_node_parent(iter->path, b);
        as = bch2_btree_update_start(trans, iter->path, b->c.level,
@@ -1750,8 +1739,6 @@ retry:
                 : 0) + 1,
                flags);
        ret = PTR_ERR_OR_ZERO(as);
-       if (ret == -EINTR)
-               goto retry;
        if (ret) {
                trace_btree_gc_rewrite_node_fail(c, b);
                goto out;
@@ -1799,20 +1786,38 @@ struct async_btree_rewrite {
        __le64                  seq;
 };
 
+static int async_btree_node_rewrite_trans(struct btree_trans *trans,
+                                         struct async_btree_rewrite *a)
+{
+       struct btree_iter iter;
+       struct btree *b;
+       int ret;
+
+       bch2_trans_node_iter_init(trans, &iter, a->btree_id, a->pos,
+                                 BTREE_MAX_DEPTH, a->level, 0);
+       b = bch2_btree_iter_peek_node(&iter);
+       ret = PTR_ERR_OR_ZERO(b);
+       if (ret)
+               goto out;
+
+       if (!b || b->data->keys.seq != a->seq)
+               goto out;
+
+       ret = bch2_btree_node_rewrite(trans, &iter, b, 0);
+out :
+       bch2_trans_iter_exit(trans, &iter);
+
+       return ret;
+}
+
 void async_btree_node_rewrite_work(struct work_struct *work)
 {
        struct async_btree_rewrite *a =
                container_of(work, struct async_btree_rewrite, work);
        struct bch_fs *c = a->c;
-       struct btree_trans trans;
-       struct btree_iter iter;
 
-       bch2_trans_init(&trans, c, 0, 0);
-       bch2_trans_node_iter_init(&trans, &iter, a->btree_id, a->pos,
-                                       BTREE_MAX_DEPTH, a->level, 0);
-       bch2_btree_node_rewrite(&trans, &iter, a->seq, 0);
-       bch2_trans_iter_exit(&trans, &iter);
-       bch2_trans_exit(&trans);
+       bch2_trans_do(c, NULL, NULL, 0,
+                     async_btree_node_rewrite_trans(&trans, a));
        percpu_ref_put(&c->writes);
        kfree(a);
 }

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index db980014172827e80e6e52b82f19d87a8dda1b58..1d7b8696af0173f36cf05ab85eb22396a76208a5 100644 (file)
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -910,8 +910,11 @@ retry:
                                BUG();
                        }
 
-                       ret = bch2_btree_node_rewrite(&trans, &iter,
-                                       b->data->keys.seq, 0) ?: ret;
+                       ret = bch2_btree_node_rewrite(&trans, &iter, b, 0) ?: ret;
+                       if (ret == -EINTR)
+                               continue;
+                       if (ret)
+                               break;
 next:
                        bch2_btree_iter_next_node(&iter);
                }