lkml.org 
[lkml]   [2015]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/3] staging: lustre: Delete unnecessary checks before two function calls
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Thu, 5 Nov 2015 10:18:45 +0100

    The functions kobject_put() and kset_unregister() test whether their
    argument is NULL and then return immediately.
    Thus the tests around their calls are not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 10 +++-------
    drivers/staging/lustre/lustre/lmv/lmv_obd.c | 5 ++---
    drivers/staging/lustre/lustre/lov/lov_obd.c | 4 +---
    drivers/staging/lustre/lustre/obdclass/genops.c | 6 ++----
    4 files changed, 8 insertions(+), 17 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
    index ca11511..e67e84b 100644
    --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
    +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
    @@ -1062,13 +1062,9 @@ static int ldlm_cleanup(void)
    if (ldlm_state->ldlm_cb_service != NULL)
    ptlrpc_unregister_service(ldlm_state->ldlm_cb_service);

    - if (ldlm_ns_kset)
    - kset_unregister(ldlm_ns_kset);
    - if (ldlm_svc_kset)
    - kset_unregister(ldlm_svc_kset);
    - if (ldlm_kobj)
    - kobject_put(ldlm_kobj);
    -
    + kset_unregister(ldlm_ns_kset);
    + kset_unregister(ldlm_svc_kset);
    + kobject_put(ldlm_kobj);
    ldlm_debugfs_cleanup();

    kfree(ldlm_state);
    diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
    index 635a93c..c3c8e8c 100644
    --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
    +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
    @@ -240,7 +240,7 @@ static int lmv_connect(const struct lu_env *env,
    if (data->ocd_connect_flags & OBD_CONNECT_REAL)
    rc = lmv_check_connect(obd);

    - if (rc && lmv->lmv_tgts_kobj)
    + if (rc)
    kobject_put(lmv->lmv_tgts_kobj);

    return rc;
    @@ -646,8 +646,7 @@ static int lmv_disconnect(struct obd_export *exp)
    lmv_disconnect_mdc(obd, lmv->tgts[i]);
    }

    - if (lmv->lmv_tgts_kobj)
    - kobject_put(lmv->lmv_tgts_kobj);
    + kobject_put(lmv->lmv_tgts_kobj);

    out_local:
    /*
    diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
    index 7abe484..910c62c 100644
    --- a/drivers/staging/lustre/lustre/lov/lov_obd.c
    +++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
    @@ -109,9 +109,7 @@ static void lov_putref(struct obd_device *obd)
    __lov_del_obd(obd, tgt);
    }

    - if (lov->lov_tgts_kobj)
    - kobject_put(lov->lov_tgts_kobj);
    -
    + kobject_put(lov->lov_tgts_kobj);
    } else {
    mutex_unlock(&lov->lov_lock);
    }
    diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
    index 6477aeb..a1cf8e1 100644
    --- a/drivers/staging/lustre/lustre/obdclass/genops.c
    +++ b/drivers/staging/lustre/lustre/obdclass/genops.c
    @@ -216,8 +216,7 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
    return 0;

    failed:
    - if (type->typ_kobj)
    - kobject_put(type->typ_kobj);
    + kobject_put(type->typ_kobj);
    kfree(type->typ_name);
    kfree(type->typ_md_ops);
    kfree(type->typ_dt_ops);
    @@ -244,8 +243,7 @@ int class_unregister_type(const char *name)
    return -EBUSY;
    }

    - if (type->typ_kobj)
    - kobject_put(type->typ_kobj);
    + kobject_put(type->typ_kobj);

    if (!IS_ERR_OR_NULL(type->typ_debugfs_entry))
    ldebugfs_remove(&type->typ_debugfs_entry);
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-11-05 13:41    [W:4.024 / U:0.968 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site