Merge tag 'trace-v4.14-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

[linux.git] / fs / orangefs / orangefs-debugfs.c

diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 716ed337f1663ddfaf0729c5d8275b0366308f19..5f59917fd631ca8ed3952bd02ac86d4b2a0de8fb 100644 (file)
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -571,11 +571,8 @@ static int orangefs_prepare_cdm_array(char *debug_array_string)
                goto out;
        }
 
-       cdm_array =
-               kzalloc(cdm_element_count * sizeof(struct client_debug_mask),
-                       GFP_KERNEL);
+       cdm_array = kcalloc(cdm_element_count, sizeof(*cdm_array), GFP_KERNEL);
        if (!cdm_array) {
-               pr_info("malloc failed for cdm_array!\n");
                rc = -ENOMEM;
                goto out;
        }