bcachefs: Drop trans arg to bch2_extent_atomic_end()

Just for consistency

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c
index 63afbf24a101831d38bd0d987c518935b30a12db..1d400808d8424769e6f4e08904b25a0bc0648754 100644 (file)
--- a/fs/bcachefs/extents.c
+++ b/fs/bcachefs/extents.c
@@ -993,11 +993,11 @@ static int __bch2_extent_atomic_end(struct btree_trans *trans,
        return ret;
 }
 
-int bch2_extent_atomic_end(struct btree_trans *trans,
-                          struct btree_iter *iter,
+int bch2_extent_atomic_end(struct btree_iter *iter,
                           struct bkey_i *insert,
                           struct bpos *end)
 {
+       struct btree_trans *trans = iter->trans;
        struct btree *b = iter->l[0].b;
        struct btree_node_iter  node_iter = iter->l[0].iter;
        struct bkey_packed      *_k;
@@ -1049,7 +1049,7 @@ int bch2_extent_trim_atomic(struct bkey_i *k, struct btree_iter *iter)
        struct bpos end;
        int ret;
 
-       ret = bch2_extent_atomic_end(iter->trans, iter, k, &end);
+       ret = bch2_extent_atomic_end(iter, k, &end);
        if (ret)
                return ret;
 
@@ -1062,7 +1062,7 @@ int bch2_extent_is_atomic(struct bkey_i *k, struct btree_iter *iter)
        struct bpos end;
        int ret;
 
-       ret = bch2_extent_atomic_end(iter->trans, iter, k, &end);
+       ret = bch2_extent_atomic_end(iter, k, &end);
        if (ret)
                return ret;
 

diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h
index 766584939304fa2132a362a46875aa67357932cd..c10388aee634260b3ea1313ed361e979ded3bdd6 100644 (file)
--- a/fs/bcachefs/extents.h
+++ b/fs/bcachefs/extents.h
@@ -433,8 +433,8 @@ enum merge_result bch2_reservation_merge(struct bch_fs *,
        .key_merge      = bch2_reservation_merge,               \
 }
 
-int bch2_extent_atomic_end(struct btree_trans *, struct btree_iter *,
-                          struct bkey_i *, struct bpos *);
+int bch2_extent_atomic_end(struct btree_iter *, struct bkey_i *,
+                          struct bpos *);
 int bch2_extent_trim_atomic(struct bkey_i *, struct btree_iter *);
 int bch2_extent_is_atomic(struct bkey_i *, struct btree_iter *);
 

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 5be34231a0c363ed0f21c0991c656d2cc2f6cac8..98d9a1432e507af654b930a6007f206e192403d3 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -281,8 +281,7 @@ retry:
                if (ret)
                        goto err;
 
-               ret = bch2_extent_atomic_end(&trans, split_iter,
-                                            k, &atomic_end);
+               ret = bch2_extent_atomic_end(split_iter, k, &atomic_end);
                if (ret)
                        goto err;