diff options
| author | Dave Chinner | 2013-09-02 12:53:00 +0200 |
|---|---|---|
| committer | Ben Myers | 2013-09-10 20:57:03 +0200 |
| commit | fdd3cceef46f2c18c618669cfae5c0f47d6982f9 (patch) | |
| tree | 4f408c2bc2bc36bf5f4da36fd0e0f51fc4857964 /fs/xfs/kmem.c | |
| parent | xfs: fix memory allocation failures with ACLs (diff) | |
| download | kernel-qcow2-linux-fdd3cceef46f2c18c618669cfae5c0f47d6982f9.tar.gz kernel-qcow2-linux-fdd3cceef46f2c18c618669cfae5c0f47d6982f9.tar.xz kernel-qcow2-linux-fdd3cceef46f2c18c618669cfae5c0f47d6982f9.zip | |
xfs: factor all the kmalloc-or-vmalloc fallback allocations
We have quite a few places now where we do:
x = kmem_zalloc(large size)
if (!x)
x = kmem_zalloc_large(large size)
and do a similar dance when freeing the memory. kmem_free() already
does the correct freeing dance, and kmem_zalloc_large() is only ever
called in these constructs, so just factor it all into
kmem_zalloc_large() and kmem_free().
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/kmem.c')
| -rw-r--r-- | fs/xfs/kmem.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c index 4a7286c1dc80..a02cfb9e3bce 100644 --- a/fs/xfs/kmem.c +++ b/fs/xfs/kmem.c @@ -27,8 +27,6 @@ /* * Greedy allocation. May fail and may return vmalloced memory. - * - * Must be freed using kmem_free_large. */ void * kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize) @@ -36,7 +34,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize) void *ptr; size_t kmsize = maxsize; - while (!(ptr = kmem_zalloc_large(kmsize))) { + while (!(ptr = vzalloc(kmsize))) { if ((kmsize >>= 1) <= minsize) kmsize = minsize; } @@ -75,6 +73,17 @@ kmem_zalloc(size_t size, xfs_km_flags_t flags) return ptr; } +void * +kmem_zalloc_large(size_t size, xfs_km_flags_t flags) +{ + void *ptr; + + ptr = kmem_zalloc(size, flags | KM_MAYFAIL); + if (ptr) + return ptr; + return vzalloc(size); +} + void kmem_free(const void *ptr) { |