From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 7 Sep 2019 22:03:56 +0000 (-0400)
Subject: bcachefs: Drop trans arg to bch2_extent_atomic_end()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9c5519336731174cc79ef23543909f9f4e11f64;p=linux.git

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 63afbf24a1018..1d400808d8424 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 766584939304f..c10388aee6342 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 5be34231a0c36..98d9a1432e507 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;