Messages in this thread Patch in this message | | | Date | Sat, 2 Jul 2011 19:59:01 +0200 (CEST) | From | Jesper Juhl <> | Subject | [PATCH] fs, dlm: don't do pointless NULL check and use kzalloc |
| |
In fs/dlm/lock.c in the dlm_scan_waiters() function there are 2 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.
Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: David Teigland <teigland@redhat.com> --- fs/dlm/lock.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index f71d0b5..26d6d88 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -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(GFP_KERNEL, num_nodes * sizeof(int)); } if (!warned) continue; @@ -863,9 +861,7 @@ 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); + kfree(warned); if (debug_expired) log_debug(ls, "scan_waiters %u warn %u over %d us max %lld us", -- 1.7.6
-- Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.
| |