Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c03f554 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

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: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc31f99b

drivers/staging/lustre/lnet/libcfs/libcfs_mem.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -54,8 +54,7 @@ cfs_percpt_free(void *vars) 
			LIBCFS_FREE(arr->va_ptrs[i], arr->va_size);

			LIBCFS_FREE(arr->va_ptrs[i], arr->va_size);

	}

	}





	LIBCFS_FREE(arr, offsetof(struct cfs_var_array,

	kvfree(arr);

				  va_ptrs[arr->va_count]));

}

}

EXPORT_SYMBOL(cfs_percpt_free);

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);

	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)

	if (!arr)

		return NULL;

		return NULL;