mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
staging: lustre: remove LIBCFS_ALLOC, LIBCFS_FREE and related macros.
LIBCFS_ALLOC LIBCFS_ALLOC_ATOMIC LIBCFS_ALLOC_POST LIBCFS_CPT_ALLOC LIBCFS_FREE are no longer used, and so are removed. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8d60ecd99c
commit
5b135f6b50
@ -75,57 +75,6 @@ do { \
|
|||||||
lbug_with_loc(&msgdata); \
|
lbug_with_loc(&msgdata); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define LIBCFS_ALLOC_POST(ptr, size) \
|
|
||||||
do { \
|
|
||||||
if (unlikely(!(ptr))) { \
|
|
||||||
CERROR("LNET: out of memory at %s:%d (tried to alloc '" \
|
|
||||||
#ptr "' = %d)\n", __FILE__, __LINE__, (int)(size)); \
|
|
||||||
} else { \
|
|
||||||
memset((ptr), 0, (size)); \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* default allocator
|
|
||||||
*/
|
|
||||||
#define LIBCFS_ALLOC(ptr, size) \
|
|
||||||
do { \
|
|
||||||
LASSERT(!in_interrupt()); \
|
|
||||||
(ptr) = kvmalloc((size), GFP_NOFS); \
|
|
||||||
LIBCFS_ALLOC_POST((ptr), (size)); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* non-sleeping allocator
|
|
||||||
*/
|
|
||||||
#define LIBCFS_ALLOC_ATOMIC(ptr, size) \
|
|
||||||
do { \
|
|
||||||
(ptr) = kmalloc((size), GFP_ATOMIC); \
|
|
||||||
LIBCFS_ALLOC_POST(ptr, size); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* allocate memory for specified CPU partition
|
|
||||||
* \a cptab != NULL, \a cpt is CPU partition id of \a cptab
|
|
||||||
* \a cptab == NULL, \a cpt is HW NUMA node id
|
|
||||||
*/
|
|
||||||
#define LIBCFS_CPT_ALLOC(ptr, cptab, cpt, size) \
|
|
||||||
do { \
|
|
||||||
LASSERT(!in_interrupt()); \
|
|
||||||
(ptr) = kvmalloc_node((size), GFP_NOFS, cfs_cpt_spread_node(cptab, cpt)); \
|
|
||||||
LIBCFS_ALLOC_POST((ptr), (size)); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define LIBCFS_FREE(ptr, size) \
|
|
||||||
do { \
|
|
||||||
if (unlikely(!(ptr))) { \
|
|
||||||
CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at " \
|
|
||||||
"%s:%d\n", (int)(size), __FILE__, __LINE__); \
|
|
||||||
break; \
|
|
||||||
} \
|
|
||||||
kvfree(ptr); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Use #define rather than inline, as lnet_cpt_table() might
|
* Use #define rather than inline, as lnet_cpt_table() might
|
||||||
* not be defined yet
|
* not be defined yet
|
||||||
|
Loading…
Reference in New Issue
Block a user