From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756173AbdETOc1 (ORCPT ); Sat, 20 May 2017 10:32:27 -0400 Received: from mout.web.de ([212.227.17.11]:62629 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbdETOcZ (ORCPT ); Sat, 20 May 2017 10:32:25 -0400 Subject: [PATCH 2/2] vhost/scsi: Delete error messages for failed memory allocations in five functions From: SF Markus Elfring To: kvm@vger.kernel.org, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, Jason Wang , "Michael S. Tsirkin" Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang References: Message-ID: Date: Sat, 20 May 2017 16:32:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:RjVmRunLLt/vl1VV1OsYpnkTZahv3EO/upMznxYWrgXKIy7c4Kl AA05ayiINQmgxI+axh1XLr0lYKnBmXc8cmdaTPdSOLa/HONP/GHhpcGkc+kqWGuPfzheGz0 NalATMJlApyKgDIa+3OItSsqgxY02n3MPavrksKF08he+xOE6EUejCiWUiKVsDPv7Yfs98D kdMMjnLFLo9ttRY3oITNg== X-UI-Out-Filterresults: notjunk:1;V01:K0:B6pdjoHYiXA=:p2q2MaMRqvliqv+37ZpdKk No87TRRipEyYlWQzFwP58jaRpaAj3MeQYwL71wKuoNAyDtYwasy6K34gvWcyUmpRJ4XM+YSq+ efW0dz+OBe/ba/8L/Z2/t5cxahnBb3FCYOQD/KmH1PKsZSlNFLlA+8BzcmU+a+27hSIgp3PAo c0BhIvucXSpNtelYpXJT25awVJlEru1Bv6jYz6HO1rsa2B8VCXZ/CEyvKMqEYXCbwa0xJmWdY oneqgB5oMkTjOtjXWDVyAmszs6mfUeJUC7Q4ZZS19asHK9BVxyUIjHFc7jiWct3rS9kEIE7VH sF2A7aCiZSqr5rBhub2jD81RPiAoI640JfZNbC8vUM1+UY4YobZyVSF/eM+idEe5SWZyXdIBG 29iE3DpxMRMw0ewrcm/x0fcZsFt2fzxjcMEevqyx7JSK+TIsTiAImEBCWyv7ZmMDbNuQj5MW9 iYhtBAYLaAdfmJ3mIf2dhVpaHLr6lAix2iBO1xZDqDiTEZS7ustnIH/LfcndFjSlrnY65kVFm Eq+qzF5PMMFPwNViuluKICYMeyS+PDNmseccZfIeCOV+LMMRn4loyUdEZWC2WNilQp0ipMEu7 NrpgCM4tqz3waPzb8YZSckZ7qTPuY/MvayZksAyFI/EaVPXVkG/O/zOyp/gvajUn2kMzTbssE 7sfG9BbVAN99JOyFgULdear1HkbpMTqDy74aCTmuh48oBvp5KRMrUO9ojmSh9o/in3XpZdZUi c5gb/O1Bv7IhCXDGbfW/4k5S1SmMX80EBvRIAwdNXU8eCmVSzlrNfBWdRhm55tHO2X3FG+oCn qdIQTbe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 20 May 2017 15:50:30 +0200 Omit seven extra messages for memory allocation failures in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- drivers/vhost/scsi.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 650533916c19..49d07950e2e5 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -417,5 +417,4 @@ vhost_scsi_allocate_evt(struct vhost_scsi *vs, if (!evt) { - vq_err(vq, "Failed to allocate vhost_scsi_evt\n"); vs->vs_events_missed = true; return NULL; } @@ -1722,21 +1721,15 @@ static int vhost_scsi_nexus_cb(struct se_portal_group *se_tpg, - if (!tv_cmd->tvc_sgl) { - pr_err("Unable to allocate tv_cmd->tvc_sgl\n"); + if (!tv_cmd->tvc_sgl) goto out; - } tv_cmd->tvc_upages = kzalloc(sizeof(struct page *) * VHOST_SCSI_PREALLOC_UPAGES, GFP_KERNEL); - if (!tv_cmd->tvc_upages) { - pr_err("Unable to allocate tv_cmd->tvc_upages\n"); + if (!tv_cmd->tvc_upages) goto out; - } tv_cmd->tvc_prot_sgl = kzalloc(sizeof(struct scatterlist) * VHOST_SCSI_PREALLOC_PROT_SGLS, GFP_KERNEL); - if (!tv_cmd->tvc_prot_sgl) { - pr_err("Unable to allocate tv_cmd->tvc_prot_sgl\n"); + if (!tv_cmd->tvc_prot_sgl) goto out; - } } return 0; out: @@ -1760,6 +1753,5 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg, if (!tv_nexus) { mutex_unlock(&tpg->tv_tpg_mutex); - pr_err("Unable to allocate struct vhost_scsi_nexus\n"); return -ENOMEM; } /* @@ -1961,7 +1953,6 @@ vhost_scsi_make_tpg(struct se_wwn *wwn, - if (!tpg) { - pr_err("Unable to allocate struct vhost_scsi_tpg"); + if (!tpg) return ERR_PTR(-ENOMEM); - } + mutex_init(&tpg->tv_tpg_mutex); INIT_LIST_HEAD(&tpg->tv_tpg_list); tpg->tport = tport; @@ -2015,7 +2006,6 @@ vhost_scsi_make_tport(struct target_fabric_configfs *tf, - if (!tport) { - pr_err("Unable to allocate struct vhost_scsi_tport"); + if (!tport) return ERR_PTR(-ENOMEM); - } + tport->tport_wwpn = wwpn; /* * Determine the emulated Protocol Identifier and Target Port Name -- 2.13.0