kevin/linux
1
Fork 0
Code

dm vdo memory-alloc: return VDO_SUCCESS on success

Browse Source 
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
This commit is contained in:
Mike Snitzer 2024-02-13 11:37:05 -06:00
parent ee8f6ec1b1
commit 97d3380396
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/md/dm-vdo/memory-alloc.c
View File

@ -194,7 +194,7 @@ static inline bool use_kmalloc(size_t size)
* @what: What is being allocated (for error logging) * @what: What is being allocated (for error logging)
* @ptr: A pointer to hold the allocated memory * @ptr: A pointer to hold the allocated memory
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_SUCCESS or an error code
*/ */
int vdo_allocate_memory(size_t size, size_t align, const char *what, void *ptr) int vdo_allocate_memory(size_t size, size_t align, const char *what, void *ptr)
{ {
@ -216,12 +216,12 @@ int vdo_allocate_memory(size_t size, size_t align, const char *what, void *ptr)
unsigned long start_time; unsigned long start_time;
void *p = NULL; void *p = NULL;
if (ptr == NULL) if (unlikely(ptr == NULL))
return UDS_INVALID_ARGUMENT; return -EINVAL;
if (size == 0) { if (size == 0) {
*((void **) ptr) = NULL; *((void **) ptr) = NULL;
return UDS_SUCCESS; return VDO_SUCCESS;
} }
if (allocations_restricted) if (allocations_restricted)
@ -245,7 +245,7 @@ int vdo_allocate_memory(size_t size, size_t align, const char *what, void *ptr)
} else { } else {
struct vmalloc_block_info *block; struct vmalloc_block_info *block;
if (vdo_allocate(1, struct vmalloc_block_info, __func__, &block) == UDS_SUCCESS) { if (vdo_allocate(1, struct vmalloc_block_info, __func__, &block) == VDO_SUCCESS) {
/* /*
* It is possible for __vmalloc to fail to allocate memory because there * It is possible for __vmalloc to fail to allocate memory because there
* are no pages available. A short sleep may allow the page reclaimer * are no pages available. A short sleep may allow the page reclaimer
@ -290,7 +290,7 @@ int vdo_allocate_memory(size_t size, size_t align, const char *what, void *ptr)
} }
*((void **) ptr) = p; *((void **) ptr) = p;
return UDS_SUCCESS; return VDO_SUCCESS;
} }
/* /*
@ -335,7 +335,7 @@ void vdo_free(void *ptr)
* @what: What is being allocated (for error logging) * @what: What is being allocated (for error logging)
* @new_ptr: A pointer to hold the reallocated pointer * @new_ptr: A pointer to hold the reallocated pointer
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_SUCCESS or an error code
*/ */
int vdo_reallocate_memory(void *ptr, size_t old_size, size_t size, const char *what, int vdo_reallocate_memory(void *ptr, size_t old_size, size_t size, const char *what,
void *new_ptr) void *new_ptr)
@ -345,11 +345,11 @@ int vdo_reallocate_memory(void *ptr, size_t old_size, size_t size, const char *w
if (size == 0) { if (size == 0) {
vdo_free(ptr); vdo_free(ptr);
*(void **) new_ptr = NULL; *(void **) new_ptr = NULL;
return UDS_SUCCESS; return VDO_SUCCESS;
} }
result = vdo_allocate(size, char, what, new_ptr); result = vdo_allocate(size, char, what, new_ptr);
if (result != UDS_SUCCESS) if (result != VDO_SUCCESS)
return result; return result;
if (ptr != NULL) { if (ptr != NULL) {
@ -360,7 +360,7 @@ int vdo_reallocate_memory(void *ptr, size_t old_size, size_t size, const char *w
vdo_free(ptr); vdo_free(ptr);
} }
return UDS_SUCCESS; return VDO_SUCCESS;
} }
int vdo_duplicate_string(const char *string, const char *what, char **new_string) int vdo_duplicate_string(const char *string, const char *what, char **new_string)
@ -369,12 +369,12 @@ int vdo_duplicate_string(const char *string, const char *what, char **new_string
u8 *dup; u8 *dup;
result = vdo_allocate(strlen(string) + 1, u8, what, &dup); result = vdo_allocate(strlen(string) + 1, u8, what, &dup);
if (result != UDS_SUCCESS) if (result != VDO_SUCCESS)
return result; return result;
memcpy(dup, string, strlen(string) + 1); memcpy(dup, string, strlen(string) + 1);
*new_string = dup; *new_string = dup;
return UDS_SUCCESS; return VDO_SUCCESS;
} }
void vdo_memory_init(void) void vdo_memory_init(void)

8
drivers/md/dm-vdo/memory-alloc.h
View File

@ -35,7 +35,7 @@ int __must_check vdo_allocate_memory(size_t size, size_t align, const char *what
* @what: What is being allocated (for error logging) * @what: What is being allocated (for error logging)
* @ptr: A pointer to hold the allocated memory * @ptr: A pointer to hold the allocated memory
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_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 align, const char *what, void *ptr)
@ -65,7 +65,7 @@ static inline int __vdo_do_allocation(size_t count, size_t size, size_t extra,
* @WHAT: What is being allocated (for error logging) * @WHAT: What is being allocated (for error logging)
* @PTR: A pointer to hold the allocated memory * @PTR: A pointer to hold the allocated memory
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_SUCCESS or an error code
*/ */
#define vdo_allocate(COUNT, TYPE, WHAT, PTR) \ #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)
@ -81,7 +81,7 @@ static inline int __vdo_do_allocation(size_t count, size_t size, size_t extra,
* @WHAT: What is being allocated (for error logging) * @WHAT: What is being allocated (for error logging)
* @PTR: A pointer to hold the allocated memory * @PTR: A pointer to hold the allocated memory
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_SUCCESS or an error code
*/ */
#define vdo_allocate_extended(TYPE1, COUNT, TYPE2, WHAT, PTR) \ #define vdo_allocate_extended(TYPE1, COUNT, TYPE2, WHAT, PTR) \
__extension__({ \ __extension__({ \
@ -105,7 +105,7 @@ static inline int __vdo_do_allocation(size_t count, size_t size, size_t extra,
* @what: What is being allocated (for error logging) * @what: What is being allocated (for error logging)
* @ptr: A pointer to hold the allocated memory * @ptr: A pointer to hold the allocated memory
* *
* Return: UDS_SUCCESS or an error code * Return: VDO_SUCCESS or an error code
*/ */
static inline int __must_check vdo_allocate_cache_aligned(size_t size, const char *what, void *ptr) static inline int __must_check vdo_allocate_cache_aligned(size_t size, const char *what, void *ptr)
{ {