diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-04-14 20:38:49 -0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-04-14 20:40:31 -0800 |
| commit | 819f2dde79241915a6edda2c20bb4ca5d4017030 (patch) | |
| tree | b165cdf270fd14e98ecfa4affe57943c6854529e /libbcachefs/util.h | |
| parent | 03bc9d71b13e6f8e879894f93ea16f1f4a8280c9 (diff) | |
Update bcachefs sources to f026e4e024
Diffstat (limited to 'libbcachefs/util.h')
| -rw-r--r-- | libbcachefs/util.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libbcachefs/util.h b/libbcachefs/util.h index 5669cb8a..8aa5c34b 100644 --- a/libbcachefs/util.h +++ b/libbcachefs/util.h @@ -93,7 +93,8 @@ static inline void kvpfree(void *p, size_t size) static inline void *kvpmalloc(size_t size, gfp_t gfp_mask) { return size < PAGE_SIZE ? kmalloc(size, gfp_mask) - : (void *) __get_free_pages(gfp_mask, get_order(size)) + : (void *) __get_free_pages(gfp_mask|__GFP_NOWARN, + get_order(size)) ?: __vmalloc(size, gfp_mask, PAGE_KERNEL); } @@ -750,4 +751,6 @@ static inline struct bio_vec next_contig_bvec(struct bio *bio, #define bio_for_each_contig_segment(bv, bio, iter) \ __bio_for_each_contig_segment(bv, bio, iter, (bio)->bi_iter) +size_t bch_scnmemcpy(char *, size_t, const char *, size_t); + #endif /* _BCACHE_UTIL_H */ |