fixup! bcachefs: darrays

7 files changed, 21 insertions, 21 deletions

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index b51f2de5f931..686e51dfb487 100644
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -529,7 +529,7 @@ static int btree_update_nodes_written_trans(struct btree_trans *trans,
 	struct bkey_i *k;
 	int ret;
 
-	ret = darray_make_room(trans->extra_journal_entries, as->journal_u64s);
+	ret = darray_make_room(&trans->extra_journal_entries, as->journal_u64s);
 	if (ret)
 		return ret;
 
@@ -1957,7 +1957,7 @@ static int __bch2_btree_node_update_key(struct btree_trans *trans,
 	} else {
 		BUG_ON(btree_node_root(c, b) != b);
 
-		ret = darray_make_room(trans->extra_journal_entries,
+		ret = darray_make_room(&trans->extra_journal_entries,
 				       jset_u64s(new_key->k.u64s));
 		if (ret)
 			return ret;
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 2b4d080323d1..58bb687a3a8f 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -1757,7 +1757,7 @@ int bch2_trans_log_msg(struct btree_trans *trans, const char *msg)
 	struct jset_entry_log *l;
 	int ret;
 
-	ret = darray_make_room(trans->extra_journal_entries, jset_u64s(u64s));
+	ret = darray_make_room(&trans->extra_journal_entries, jset_u64s(u64s));
 	if (ret)
 		return ret;
 
diff --git a/fs/bcachefs/darray.h b/fs/bcachefs/darray.h
index 745b1cdb0d17..049e1d1e1342 100644
--- a/fs/bcachefs/darray.h
+++ b/fs/bcachefs/darray.h
@@ -36,7 +36,7 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
 }
 
 #define darray_make_room(_d, _more)					\
-	__darray_make_room((darray_void *) &(_d), sizeof((_d).data[0]), (_more))
+	__darray_make_room((darray_void *) (_d), sizeof((_d)->data[0]), (_more))
 
 #define darray_top(_d)		((_d).data[(_d).nr])
 
@@ -45,7 +45,7 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
 	int _ret = darray_make_room((_d), 1);				\
 									\
 	if (!_ret)							\
-		(_d).data[(_d).nr++] = (_item);				\
+		(_d)->data[(_d)->nr++] = (_item);			\
 	_ret;								\
 })
 
@@ -54,7 +54,7 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
 	int _ret = darray_make_room((_d), 1);				\
 									\
 	if (!_ret)							\
-		array_insert_item((_d).data, (_d).nr, (_pos), (_item));	\
+		array_insert_item((_d)->data, (_d)->nr, (_pos), (_item));\
 	_ret;								\
 })
 
@@ -63,13 +63,13 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
 
 #define darray_init(_d)							\
 do {									\
-	(_d).data = NULL;						\
-	(_d).nr = (_d).size = 0;					\
+	(_d)->data = NULL;						\
+	(_d)->nr = (_d)->size = 0;					\
 } while (0)
 
 #define darray_exit(_d)							\
 do {									\
-	kfree((_d).data);						\
+	kfree((_d)->data);						\
 	darray_init(_d);						\
 } while (0)
 
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index abe09f062eee..f1abec95a740 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -560,7 +560,7 @@ struct inode_walker {
 
 static void inode_walker_exit(struct inode_walker *w)
 {
-	darray_exit(w->inodes);
+	darray_exit(&w->inodes);
 }
 
 static struct inode_walker inode_walker_init(void)
@@ -575,7 +575,7 @@ static int add_inode(struct bch_fs *c, struct inode_walker *w,
 
 	BUG_ON(bch2_inode_unpack(inode, &u));
 
-	return darray_push(w->inodes, ((struct inode_walker_entry) {
+	return darray_push(&w->inodes, ((struct inode_walker_entry) {
 		.inode		= u,
 		.snapshot	= snapshot_t(c, inode.k->p.snapshot)->equiv,
 	}));
@@ -628,7 +628,7 @@ found:
 		while (i && w->inodes.data[i - 1].snapshot > pos.snapshot)
 			--i;
 
-		ret = darray_insert_item(w->inodes, i, w->inodes.data[ancestor_pos]);
+		ret = darray_insert_item(&w->inodes, i, w->inodes.data[ancestor_pos]);
 		if (ret)
 			return ret;
 
@@ -1879,7 +1879,7 @@ static bool path_is_dup(pathbuf *p, u64 inum, u32 snapshot)
 static int path_down(struct bch_fs *c, pathbuf *p,
 		     u64 inum, u32 snapshot)
 {
-	int ret = darray_push(*p, ((struct pathbuf_entry) {
+	int ret = darray_push(p, ((struct pathbuf_entry) {
 		.inum		= inum,
 		.snapshot	= snapshot,
 	}));
@@ -2037,7 +2037,7 @@ static int check_directory_structure(struct bch_fs *c)
 
 	BUG_ON(ret == -EINTR);
 
-	darray_exit(path);
+	darray_exit(&path);
 
 	bch2_trans_exit(&trans);
 	return ret;
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 15d80a43659c..f1fb2ab513df 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -125,7 +125,7 @@ next:
 		}
 	}
 	bch2_trans_iter_exit(trans, &iter);
-	darray_exit(s.ids);
+	darray_exit(&s.ids);
 
 	return ret;
 }
diff --git a/fs/bcachefs/subvolume.c b/fs/bcachefs/subvolume.c
index 63a57399cb7c..81bdcb7795ae 100644
--- a/fs/bcachefs/subvolume.c
+++ b/fs/bcachefs/subvolume.c
@@ -565,7 +565,7 @@ static int snapshot_id_add(snapshot_id_list *s, u32 id)
 {
 	BUG_ON(snapshot_list_has_id(s, id));
 
-	return darray_push(*s, id);
+	return darray_push(s, id);
 }
 
 static int bch2_snapshot_delete_keys_btree(struct btree_trans *trans,
@@ -622,7 +622,7 @@ static int bch2_snapshot_delete_keys_btree(struct btree_trans *trans,
 	}
 	bch2_trans_iter_exit(trans, &iter);
 
-	darray_exit(equiv_seen);
+	darray_exit(&equiv_seen);
 
 	return ret;
 }
@@ -722,7 +722,7 @@ static void bch2_delete_dead_snapshots_work(struct work_struct *work)
 		}
 	}
 err:
-	darray_exit(deleted);
+	darray_exit(&deleted);
 	bch2_trans_exit(&trans);
 	percpu_ref_put(&c->writes);
 }
@@ -888,7 +888,7 @@ void bch2_subvolume_wait_for_pagecache_and_delete(struct work_struct *work)
 	while (!ret) {
 		mutex_lock(&c->snapshots_unlinked_lock);
 		s = c->snapshots_unlinked;
-		darray_init(c->snapshots_unlinked);
+		darray_init(&c->snapshots_unlinked);
 		mutex_unlock(&c->snapshots_unlinked_lock);
 
 		if (!s.nr)
@@ -905,7 +905,7 @@ void bch2_subvolume_wait_for_pagecache_and_delete(struct work_struct *work)
 			}
 		}
 
-		darray_exit(s);
+		darray_exit(&s);
 	}
 
 	percpu_ref_put(&c->writes);
diff --git a/fs/bcachefs/subvolume.h b/fs/bcachefs/subvolume.h
index a44253893515..b1739d29c7d4 100644
--- a/fs/bcachefs/subvolume.h
+++ b/fs/bcachefs/subvolume.h
@@ -76,7 +76,7 @@ static inline void snapshots_seen_init(struct snapshots_seen *s)
 
 static inline int snapshots_seen_add(struct bch_fs *c, struct snapshots_seen *s, u32 id)
 {
-	int ret = darray_push(s->ids, id);
+	int ret = darray_push(&s->ids, id);
 	if (ret)
 		bch_err(c, "error reallocating snapshots_seen table (size %zu)",
 			s->ids.size);