From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdHQUN1 (ORCPT ); Thu, 17 Aug 2017 16:13:27 -0400 Received: from mout.web.de ([212.227.17.11]:60915 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512AbdHQUNX (ORCPT ); Thu, 17 Aug 2017 16:13:23 -0400 Subject: [PATCH 1/3] orangefs: Delete error messages for a failed memory allocation in five functions From: SF Markus Elfring To: Martin Brandenburg , Mike Marshall , kernel-janitors@vger.kernel.org Cc: LKML References: <6802994a-a537-2e00-e7d8-c1b822879f76@users.sourceforge.net> Message-ID: <5ee0f84b-1149-7488-c57f-84d1dd0e65c7@users.sourceforge.net> Date: Thu, 17 Aug 2017 22:13:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <6802994a-a537-2e00-e7d8-c1b822879f76@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:drxq1O/X3k0/Pdt62erO8CipDcntvbgMk4el27Cv1SIwj3Bn2My qSjZbCEX8/OaO88aWdPLN9PmxF6avTJnP6/NKN7gG70OhlfJj3Q1Iiz0EYCl9/3xC9SimzJ 1chMi9AINXmyK56Nyxj0naTs+2J6c/+KHykoBCWSuQ7D6nfbVhcanbYVUAp41rmCT+3FqhX YX1lBd4WyXu8UCx+C71zA== X-UI-Out-Filterresults: notjunk:1;V01:K0:oUqC/Q+tdZc=:mmoXR/gPuCaj929ba4HciM 0zlYhLuw0gxOkRfmU3Z2wNEgxNhKxgDydOlZrVUWgFOLwWNbtq5IpFqVNOb4UeQt4CiQ2g56v oSdC0Ii7eYtrMLJvVesFbY7DJRKsdTl4/cSdBtZ+59BezGKMHgGPzsV4cqIGOyE23BSpLx6ZW vrki1GIxHox0weY+I3jyrLyQiCIgrX0PmjRgK38DMcjiEsRYyvgVh+iyd+joXiz+WvdhR4aQg 9NDAb7AZILG2VZKxhQfpujACDnVrL9PGDtepOUhpfb+xWXqARS3fuS17oXA8AcHK482YUycwz 59ztGsrCA6v0voC9zVf5FGbZYPUYrizgqF35EQC7vRGPrP98fLgvQnPYXe9KIJfMqG0bOV8C5 G/lNLJtvDTgevQhhovsESIZz17RL5SJnWgvnedBYeC9/yDLjRef92wtVw71mtLePTHfzXOB09 j9qQjEqdNEYPp4sdqZTj5FbV4CvzBCrjOdv9wvey5JRxfc17DDVtaAawQG3kN+mp2BXqUSVVB 4eF/OqIcXFylgjVmRY92MXyvQI7YBfeTXngQaEa/BKSrq8daX2dEYlnU0/MQ+DjukXF08gb5y LgV0GvkYuND06rkRdvASuj2ZYpUdNW0T2vW6AsIzcoN8S3Ia7uWC4mLQnF+4CmX9LipAAV0UK IvkJD9gxl3em/AcAcpxSKZ/yFgZlwdZhTbBOzJz044qiM9hwlhm8nW3+V5JIt7r3L13wVs/qM XJUQfrkSZ/8ct8DCJTD7m91v00FJc1214unKbcAPPdzA9tPR17Q6btzU43QlIgdw+FTE0Imyl 9leSPQ+7TOdErZsVcGWkADk4CX99DvdZ0gkyh3WjMB2MgZapR0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 17 Aug 2017 21:00:07 +0200 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- fs/orangefs/devorangefs-req.c | 9 +++------ fs/orangefs/orangefs-bufmap.c | 10 ++-------- fs/orangefs/orangefs-debugfs.c | 1 - fs/orangefs/orangefs-mod.c | 1 - fs/orangefs/super.c | 4 +--- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c index c19f0787c9c6..2826859bdc2c 100644 --- a/fs/orangefs/devorangefs-req.c +++ b/fs/orangefs/devorangefs-req.c @@ -461,13 +461,10 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb, if (op->downcall.type != ORANGEFS_VFS_OP_READDIR) goto wakeup; - op->downcall.trailer_buf = - vmalloc(op->downcall.trailer_size); - if (op->downcall.trailer_buf == NULL) { - gossip_err("%s: failed trailer vmalloc.\n", - __func__); + op->downcall.trailer_buf = vmalloc(op->downcall.trailer_size); + if (!op->downcall.trailer_buf) goto Enomem; - } + memset(op->downcall.trailer_buf, 0, op->downcall.trailer_size); if (!copy_from_iter_full(op->downcall.trailer_buf, op->downcall.trailer_size, iter)) { diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index 038d67545d9f..7ef473f3d642 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -244,20 +244,14 @@ orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc) bufmap->buffer_index_array = kzalloc(DIV_ROUND_UP(bufmap->desc_count, BITS_PER_LONG), GFP_KERNEL); - if (!bufmap->buffer_index_array) { - gossip_err("orangefs: could not allocate %d buffer indices\n", - bufmap->desc_count); + if (!bufmap->buffer_index_array) goto out_free_bufmap; - } bufmap->desc_array = kcalloc(bufmap->desc_count, sizeof(struct orangefs_bufmap_desc), GFP_KERNEL); - if (!bufmap->desc_array) { - gossip_err("orangefs: could not allocate %d descriptors\n", - bufmap->desc_count); + if (!bufmap->desc_array) goto out_free_index_array; - } bufmap->page_count = bufmap->total_size / PAGE_SIZE; diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 716ed337f166..93fe8f8e60f1 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -577,5 +577,4 @@ static int orangefs_prepare_cdm_array(char *debug_array_string) if (!cdm_array) { - pr_info("malloc failed for cdm_array!\n"); rc = -ENOMEM; goto out; } diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c index c1b5174cb5a9..85ef87245a87 100644 --- a/fs/orangefs/orangefs-mod.c +++ b/fs/orangefs/orangefs-mod.c @@ -100,5 +100,4 @@ static int __init orangefs_init(void) if (!orangefs_htable_ops_in_progress) { - gossip_err("Failed to initialize op hashtable"); ret = -ENOMEM; goto cleanup_inode; } diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 5a1bed6c8c6a..47f3fb9cbec4 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -107,10 +107,8 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb) struct orangefs_inode_s *orangefs_inode; orangefs_inode = kmem_cache_alloc(orangefs_inode_cache, GFP_KERNEL); - if (orangefs_inode == NULL) { - gossip_err("Failed to allocate orangefs_inode\n"); + if (!orangefs_inode) return NULL; - } /* * We want to clear everything except for rw_semaphore and the -- 2.14.0