Commit 8f89115e authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm vdo memory-alloc: rename vdo_do_allocation to __vdo_do_allocation 



__vdo_do_allocation shouldn't be used outside of memory-alloc.h, so
add hidden prefix.

Also, tabify the vdo_allocate_extended macro.

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarMatthew Sakai <msakai@redhat.com>
parent 0eea6b6e

drivers/md/dm-vdo/memory-alloc.h

+15 −15
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int __must_check vdo_allocate_memory(size_t size, size_t align, const char *what 
 *

 * Return: UDS_SUCCESS or an error code

 */

static inline int vdo_do_allocation(size_t count, size_t size, size_t extra,

static inline int __vdo_do_allocation(size_t count, size_t size, size_t extra,

				      size_t align, const char *what, void *ptr)

{

	size_t total_size = count * size + extra;
@@ -68,7 +68,7 @@ static inline int vdo_do_allocation(size_t count, size_t size, size_t extra, 
 * Return: UDS_SUCCESS or an error code

 */

#define vdo_allocate(COUNT, TYPE, WHAT, PTR) \

	vdo_do_allocation(COUNT, sizeof(TYPE), 0, __alignof__(TYPE), WHAT, PTR)

	__vdo_do_allocation(COUNT, sizeof(TYPE), 0, __alignof__(TYPE), WHAT, PTR)



/*

 * Allocate one object of an indicated type, followed by one or more elements of a second type,
@@ -88,7 +88,7 @@ static inline int vdo_do_allocation(size_t count, size_t size, size_t extra, 
		int _result;						\

		TYPE1 **_ptr = (PTR);					\

		BUILD_BUG_ON(__alignof__(TYPE1) < __alignof__(TYPE2));	\

		_result = vdo_do_allocation(COUNT,                       \

		_result = __vdo_do_allocation(COUNT,			\

					      sizeof(TYPE2),		\

					      sizeof(TYPE1),		\

					      __alignof__(TYPE1),	\