Commit 2f48e061 authored May 06, 2017 by Markus Elfring Committed by David Teigland Aug 07, 2017

dlm: Use kcalloc() in two functions



* Multiplications for the size determination of memory allocations
  indicated that array data structures should be processed.
  Thus reuse the corresponding function "kcalloc".

  This issue was detected by using the Coccinelle software.

* Replace the specification of data structures by pointer dereferences
  to make the corresponding size determinations a bit safer according to
  the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: David Teigland <teigland@redhat.com>

parent 790854be

fs/dlm/member.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -217,8 +217,7 @@ int dlm_slots_assign(struct dlm_ls ls, int num_slots, int *slots_size,
		}

		array_size = max + need;

		array = kzalloc(array_size * sizeof(struct dlm_slot), GFP_NOFS);
		array = kcalloc(array_size, sizeof(*array), GFP_NOFS);
		if (!array)
		return -ENOMEM;

		@@ -491,8 +490,7 @@ void dlm_lsop_recover_done(struct dlm_ls *ls)
		return;

		num = ls->ls_num_nodes;

		slots = kzalloc(num * sizeof(struct dlm_slot), GFP_KERNEL);
		slots = kcalloc(num, sizeof(*slots), GFP_KERNEL);
		if (!slots)
		return;

Admin message