Commit 5d70828a authored Jul 10, 2011 by Jesper Juhl Committed by David Teigland Jul 11, 2011

dlm: don't do pointless NULL check, use kzalloc and fix order of arguments



In fs/dlm/lock.c in the dlm_scan_waiters() function there are 3 small
issues:

1) There's no need to test the return value of the allocation and do a
memset if is succeedes. Just use kzalloc() to obtain zeroed memory.

2) Since kfree() handles NULL pointers gracefully, the test of
'warned' against NULL before the kfree() after the loop is completely
pointless. Remove it.

3) The arguments to kmalloc() (now kzalloc()) were swapped. Thanks to
Dr. David Alan Gilbert for pointing this out.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: David Teigland <teigland@redhat.com>

parent bcaadf5c

fs/dlm/lock.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -849,9 +849,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)

		if (!num_nodes) {
		num_nodes = ls->ls_num_nodes;
		warned = kmalloc(GFP_KERNEL, num_nodes * sizeof(int));
		if (warned)
		memset(warned, 0, num_nodes * sizeof(int));
		warned = kzalloc(num_nodes * sizeof(int), GFP_KERNEL);
		}
		if (!warned)
		continue;
		@@ -863,8 +861,6 @@ void dlm_scan_waiters(struct dlm_ls *ls)
		dlm_config.ci_waitwarn_us, lkb->lkb_wait_nodeid);
		}
		mutex_unlock(&ls->ls_waiters_mutex);

		if (warned)
		kfree(warned);

		if (debug_expired)

Admin message