lkml.org 
[lkml]   [2017]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] vhost/scsi: Delete error messages for failed memory allocations in five functions
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    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 <elfring@users.sourceforge.net>
    ---
    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
    \
     
     \ /
      Last update: 2017-05-20 16:33    [W:3.042 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site