diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-26 16:34:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-02 00:41:47 -0400 |
| commit | 6b1f79d5df9f2735192ed1a40c711cf131d4f43e (patch) | |
| tree | 67f007fabd01964145cac4f273902f1c12927e8b /libbcachefs/btree_io.c | |
| parent | c1a8e27a3fad202750a1b66a1fd1fa82a8a5bd92 (diff) | |
Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshotsv0.29
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_io.c')
| -rw-r--r-- | libbcachefs/btree_io.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 <linux/sched/mm.h> -#include <trace/events/bcachefs.h> 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) |