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.h | |
| 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.h')
| -rw-r--r-- | fs/xfs/kmem.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index b2f2620f9a87..3a7371cab508 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -57,17 +57,10 @@ kmem_flags_convert(xfs_km_flags_t flags) extern void *kmem_alloc(size_t, xfs_km_flags_t); extern void *kmem_zalloc(size_t, xfs_km_flags_t); +extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t); extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t); extern void kmem_free(const void *); -static inline void *kmem_zalloc_large(size_t size) -{ - return vzalloc(size); -} -static inline void kmem_free_large(void *ptr) -{ - vfree(ptr); -} extern void *kmem_zalloc_greedy(size_t *, size_t, size_t); |