From f9c5519336731174cc79ef23543909f9f4e11f64 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 7 Sep 2019 18:03:56 -0400 Subject: [PATCH] bcachefs: Drop trans arg to bch2_extent_atomic_end() Just for consistency Signed-off-by: Kent Overstreet --- fs/bcachefs/extents.c | 8 ++++---- fs/bcachefs/extents.h | 4 ++-- fs/bcachefs/recovery.c | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index 63afbf24a101..1d400808d842 100644 --- 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 766584939304..c10388aee634 100644 --- 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 5be34231a0c3..98d9a1432e50 100644 --- 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; -- 2.50.1