From: NeilBrown Date: Tue, 9 Jan 2018 01:19:38 +0000 (+1100) Subject: staging: lustre: cfs_percpt_alloc: use kvmalloc(GFP_KERNEL) X-Git-Tag: v5.15~9511^2~137 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c03f554bfed0ed1bbc51492b63da64153b3bbbf;p=platform%2Fkernel%2Flinux-starfive.git staging: lustre: cfs_percpt_alloc: use kvmalloc(GFP_KERNEL) this allocation is called from several places, but all are during initialization, so GFP_NOFS is not needed. So use kvmalloc and GFP_KERNEL. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c index 23734cf..8e2b4f1 100644 --- a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c +++ b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c @@ -54,8 +54,7 @@ cfs_percpt_free(void *vars) LIBCFS_FREE(arr->va_ptrs[i], arr->va_size); } - LIBCFS_FREE(arr, offsetof(struct cfs_var_array, - va_ptrs[arr->va_count])); + kvfree(arr); } EXPORT_SYMBOL(cfs_percpt_free); @@ -79,7 +78,8 @@ cfs_percpt_alloc(struct cfs_cpt_table *cptab, unsigned int size) count = cfs_cpt_number(cptab); - LIBCFS_ALLOC(arr, offsetof(struct cfs_var_array, va_ptrs[count])); + arr = kvzalloc(offsetof(struct cfs_var_array, va_ptrs[count]), + GFP_KERNEL); if (!arr) return NULL;