From 6b1f79d5df9f2735192ed1a40c711cf131d4f43e Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 26 Apr 2023 16:34:57 -0400 Subject: Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshots Signed-off-by: Kent Overstreet --- libbcachefs/btree_io.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libbcachefs/btree_io.c') diff --git a/libbcachefs/btree_io.c b/libbcachefs/btree_io.c index 945d1b9e..decbbaac 100644 --- a/libbcachefs/btree_io.c +++ b/libbcachefs/btree_io.c @@ -18,9 +18,9 @@ #include "journal_reclaim.h" #include "journal_seq_blacklist.h" #include "super-io.h" +#include "trace.h" #include -#include void bch2_btree_node_io_unlock(struct btree *b) { @@ -105,8 +105,8 @@ static void btree_bounce_free(struct bch_fs *c, size_t size, vpfree(p, size); } -static void *_btree_bounce_alloc(struct bch_fs *c, size_t size, - bool *used_mempool) +static void *btree_bounce_alloc(struct bch_fs *c, size_t size, + bool *used_mempool) { unsigned flags = memalloc_nofs_save(); void *p; @@ -114,7 +114,7 @@ static void *_btree_bounce_alloc(struct bch_fs *c, size_t size, BUG_ON(size > btree_bytes(c)); *used_mempool = false; - p = _vpmalloc(size, __GFP_NOWARN|GFP_NOWAIT); + p = vpmalloc(size, __GFP_NOWARN|GFP_NOWAIT); if (!p) { *used_mempool = true; p = mempool_alloc(&c->btree_bounce_pool, GFP_NOIO); @@ -122,8 +122,6 @@ static void *_btree_bounce_alloc(struct bch_fs *c, size_t size, memalloc_nofs_restore(flags); return p; } -#define btree_bounce_alloc(_c, _size, _used_mempool) \ - alloc_hooks(_btree_bounce_alloc(_c, _size, _used_mempool), void *, NULL) static void sort_bkey_ptrs(const struct btree *bt, struct bkey_packed **ptrs, unsigned nr) -- cgit v1.2.3