From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755905AbdEFIqF (ORCPT ); Sat, 6 May 2017 04:46:05 -0400 Received: from mout.web.de ([212.227.17.12]:49757 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751575AbdEFIp4 (ORCPT ); Sat, 6 May 2017 04:45:56 -0400 Subject: [PATCH 08/10] dlm: Use kcalloc() in two functions From: SF Markus Elfring To: cluster-devel@redhat.com, Christine Caulfield , David Teigland Cc: LKML , kernel-janitors@vger.kernel.org References: <4bd895d7-9448-928d-1e4c-42326ce20607@users.sourceforge.net> Message-ID: <01b774a8-5f5a-8939-2b57-1fc99a864d11@users.sourceforge.net> Date: Sat, 6 May 2017 10:45:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <4bd895d7-9448-928d-1e4c-42326ce20607@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Is6bQtKOH+JisIXRBlMdxWXOGiD7IGgiyz1Eb6nscnVyDSJIP/p /hoclejDslJJshbCTdimxrmHY/fF/k06FjxvYTmmUXoj8KaMk1+aah9SoyNXcblOMNG/+3r q3rvCLpUidcoM2E5d2cJxx+JxLU60kuWTMM8P6LGVLo4CvMoLBYj6/l7ciJOi45QMFyopw5 hmMgsK6LEI0dukJKIiW7Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:o36NDC1bItY=:Olqtac81S80zedPlizSFrZ e7vlXRw994Zm1wnOqS9KunEKhs2S0bE9i9DfXKmqZEdfT+DYr3Ow5EVdp3byqc2Y68CsHuLf4 Rqhw4S8xOoG7jt9DmhVgrG26dI23AR1U6qKLBqZAYC6CV9KKll8gt0OlCnxgk1tX/KgWtspEi qPgu+V172554tY0DgwK9RNZw03bDtXTdG9BgWjziVZg9FRVeI9wwrBuSQoVziAX9mj1PDVF+m EiIn2bFdTsj1n6tesBr6jrpSy5VW9yi47akyeC/CUGqBscUfrICChQZzMekC/ESEKJDzLxYHW +JHHCjc5UlKLn9SobHTvyW4Sxpa0JemRvdOLcSIxE8ehR75SMMBGVv4JWl47yF6NSkKTWdX8c NKj2Un6IjDMkNMbjZ51Atx2VyudU6NAqkkt7p2psZaU29/Suxo+zIsSIM7yUxK5ztvhkGObKt PQ3XJFb9qh4hKaJcxnCxpnD5VJdIrot3gRF0bqFhrAWTjEou4xK+METbNVUrjyOw5M6i5vB3g N1dyeTXQoV51vyD0sPAqCOK9AyK+isOiOFCrF9j+2IptT3ForLkrcWmaRNSVbKh7OWr+EFfnz C6r9gG8TB9Lqtx0EPaT//uyBwdJCPUeWSXqFVfEz/prcZM/EbrkismdgIl4XduAsnAO0ERiw1 DB2ZxOnC4i1BMGqJFXYcmTWoBd4789/8kdUpeBlDTCChmmdYjWkucN8JqdvZ5AV/bljOez9G2 NG+0Ewovj27+HUsREhGtlL90DCLlKMvRkTK1McSTalr3Q/snCkqMR4IxRIL50FhaS0nh7dSOL ZdyyDa7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 6 May 2017 09:34:53 +0200 * 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 --- fs/dlm/member.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/dlm/member.c b/fs/dlm/member.c index 89257699d4e4..92c601a11e38 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c @@ -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; -- 2.12.2